fix automation conditions; make more tests