Spec tests rewrite

I think this is supposed to be `catch_changes`