viewMap tests fixed (TODO: code needs to be refactored, implemented quick and dirty)