Refactoring, formatting, comments
Refactored some tests - skipped others