More tests progress, cleaned up model classes.