Modify also the code to use a singleton. This simplifies the code as no locking is needed. It also slightly improves the performance because no check whether the architecture was tested is needed. Signed-off-by: Stefan Weil <sw@weilnetz.de>
