Reorganize tests. Add tests to coverage checking.