Updated packages, fixed a test that got broke, further clean-up, added async tests for mappers