Minor refactoring tweaks

Clarified code for valid movement checks
Test that I missed committing on multiple obstacles