added new test architecture, tuned parameters