Changing test setup concept (not 100% done yet)