Finish implementing TR46 tests

Now passes all relevant TR46 tests