Update the tests to include instanceof