reworked/changed test system