Repair Unit Tests
Make tests work