more fixes start mocking maps