Adding making tests a module again...