Added tests to ensure the derived/base case doesn't slip by us again!