(#1349) - Cleanup and increase timeout for #1175 test