Make tests run from any dir and clean up names