Tried fixing the tests, only fixed it so it compiles properly