Simplify tests infastructure