Upgrade gem dependencies
Change ruby code to be more idiomatic
Change matcher to be more precise