refactored testing classes due to separation of unit and int tests