Further working on making tests work