Converting Mapper tests to JUnit4
Converting option type  tests to JUnit4