Added unit test project and reordered tests