More cleanup on the test project - added a couple of missing tests too