Fix for automtests