Add clear command
Push command attributes into child classes and tidy tests