Formatted code, added test, added overloaded methods to mapper