Fixed tests, removed unused stubs, added a clearly marked bad map file