Put back contrib tests