Make Marker setIcon unit tests better.
Tidy up ugly icon-swap code.