Remove tests disabled since 2012