Add back some tests