Add more tests for command builder