Address comments, add tests