getting rid of dash trap error, expanded add_fixture if statements, be a bit more cross shell compliant