Broke some test, and made test line coverage non-complete