Tests removed into test folder