New unit tests, work in progress.