Update the test descriptions and timeout
Remove ev all together for now