Adding test architecture.