Add new tests for setting weight, and querying notes
Remove dead code