Extracted subgens into own test
Extracted Compass tests into own file
Basics cleanup