Bring back Joe's original test too