Updated Tests, Configs, added tracing