FIXUP Refactor Specs