Increase default_wait_time to 60 for CI
Slight refactor of specs