More cleanup & renaming
Fixing long running test
Using time in seconds rather than minutes