Getting more of the old tests to work