Add more testing of instances and classes.