Added unit tests and note feature