Minor improves on tests