Command spec / unit tests done