Cleaned up Qt and improved test coverage.