use latest Machete, fix rspec errors