spec coverage on remaining classes/defines