REFACTOR fix specs