Spec tests rewrite

Should this also be expect_changes?