Cleanup + fix existing tests