Some cleaned up tests... sorta
Merge branch 'master' of github.com:GantMan/teamweb
Re-enabled some tests