Improved test handling and requirements files