Accidentally commented out some tests...