refactor tests, and added some useless files.