tests pass
fix run-alone - call run
improved