Fixed tests to work with Harrison's Web-BugFix commit.