Increasing time to allow settling and small altering cleanup

Pull request is to trigger travis.