Another attempt to get these tests passing - it's not the tests or code, honest