made tests a bit more modular