Extract spec matchers into separate files
Remove duplicate method