Extended test coverage

New (basic) tests covering extended mapping functionality.