#207 processed review comments and organized test