Added test to assert custom mappers working in Scala world.
Tidied up code and tests before merge