Added usages in risky tests
removed EOL - not part of test
fixed delays