exp clean up. fixed conditions test