jwood000 Updated tests with class checks