FIxed remaining tests after refactor