Fixed command unimplemented message
Added test messages
Cleanup