re-organized solution and added Unit test project