Fix some broken tests - still need to implement vertical movement