Add initial test architecture