Move the command tests over to it's own test file, add more tests.