added more markers and tests