fixed command test addition and some merge issues