proper changes to classes for testing