Fixed regression introduced by previous commit and added a test to preve...

...nt future regressions.

Conflicts:
	lib/Spot/Entity.php