Adding some additional data to make up for isInstanceOf returning true too often.
Passing a few more unit tests