Add new tests and restructure old ones.