Fixed some bugs. We now fail a mere 18 tests.