refcatored code/new test case framework for unity windows