Added more tests and commands