Removed test generated files and some modifications