Address review comments, update test