move the rest of the tests - working from failures now