finish abstracting commands, also abstracted tests and added few more