Bring tests back from bitrot since 2009