Test refactor
Test whitespace fixes
Stub whitespace