Class moved to test folder