refining testing architecture