Fix for running smoke tests