New tests, incl. subclass