Merge "Take in test instance as field." into main