removed Marker entity and replaced with color reference;
removed obsolete tests and consolidated some tests