Improve tests directory

1. Improve test directory.
2. Merge commits into one.