Improve and refactor smoke tests