spec refactoring
partial matches