more changes to CharvaTest, Starter is back to not being a thread