Add test for get
Make get work ok with filter
Tidy up and add TODOs