Moved robust tests
Refactoring in process
70 percent refactored
Refactoring complete