Fixed references.
FIxed remaining tests after refactor