Fixed failing passing tests