Cleanup integration tests and options handling