Fixed up tests to green