Make sure that we're doing proper focus bubble testing. Also simplified the logic...