Bug fixes, 10 tests left