Added more test data + leafletusermarker changes for more colors