REPORTS-74 cleaned up classes and tests