Fixed CS errors, refactored Unit suite test class