Added some more test cases. Fixed a bug when rendering markers.