Moved map spinner.

Closes #9.
fixed tests