Added deeper testing