Remove map from tests
Merge branch 'integration' of github.com:nens/lizard-client into integration