attempt to fix tests
clean up tests
clean up tests
avoid infinite loops at all costs
case-less tags