Fix issues causing tests to fail