Port more tests to new testsuite
Port even more tests
Use templates instead of golden files