Work in progress. Changes in test-code for proposed forge v2 API