CARE #16: Create test architecture