Added more test coverage, and added command tests files