Improve spec running