Implemented a slightly more strict move test, not passing right now. Issues #12 #6