Adding more tests with mapping and imperative