Slight cleanup
Cleanup + fast working tests