Some small changed

1. More than one note entries.
2. Changes in the test case part.