FIX: Fixing broken tests, cleaning up