Direct mapping working on all tests.