Extra tests
Lots of work on bulk mapping