Fix hardcode issues in the tests