Added non-comp ifs, with TEST
env junk