Improved requirement testing and reporting for #145
Cleared all useless files for #145