Testing tools additions