[DO NOT MERGE] 1005 map tests and viewby fixes

@pld The [modal-back test](https://travis-ci.org/onaio/zebra/builds/41451969#L527)  is failing [again](https://github.com/onaio/zebra/pull/849). Permission to delete it?