Removed crappy status checking. Added web tests.