adds more tests for rectangle and circle map element

Change-Id: Ibaa77eb0a8c0b4e79d51847cf5176e16ace2a91a