Some unit tests are back