New unit tests are taking shape...