Fixed some small issues in the test project