Support for first test

Part I

Part II

Part III

Support for second test

Part IV

Part V

Part VI