Changed Test Project type to Test Project and cleaned up some code