add equipment.clj tests
pull changes from master