Update test.
Address fixes + tests