Added AfterClass cleanup in mapper test