Fixes Tests, compilation, class groupings