Removed broken tests and did some minor refactorings