Fixed up errors causing tests to fail