Finish command processing testing + code