Improved class testing