Increase timeout, and unmount and remove timeout
Remove old tests
Fix specs and remove resetting offset