Some unit tests are now explicit