add new folder on tests and remove unwanted stuff