Improve suggestion search
Added more test for command parser
Abstract out constant
Added assertion to command parser