Remove unused code
Convert tests to Fuchu
CleanUp code and test cases.