Fix unit tests to match Spec