issue #92 (moved entities fix)

A little fix, the tests weren't covering all the options.

Closes #92. Please merge asap, it's just a bugfix.