Start to get some move tests passing

Get two simple move tests passing.