"Mappers" designated as such
Simplify test
Added integration tests on import page