Fix LogicTest and change to CommandTest