fix commands & fix tests