Update system-test to support blueprint testing