Made UT follow main class move