Accidentally commented out some tests on last commit.