Support multiple runs per test

tabs fixed

styling