Added tests, make things more webcat happy