Last minute changes and finalized A version. Unit tests updated to test more commands also