Checkin of refactored test classes