Continued tweaking TagTest