Fixing mapper tests and removing unused code