Ported more things to use the nice testing framework