Fix tests, address review feedback