Complete Match spec
Bundle update, upgrade mutant and add rubocop
Code cleanup
Builder spec cleanup