Tests review

This also seems a bit strange.