Better fix for AUTOMATED_TESTS #42