updated base commands, removed extra space, changed ordering of command location lookup
added more unit tests