Migrate more of the tests to the new structure#6

lrandersson wants to merge 4 commits into

dev-ra-838lrandersson/constructor:dev-ra-838from

dev-ra-838-3lrandersson/constructor:dev-ra-838-3Copy head branch name to clipboard