This should close #6 and #7, but should only be merged back to master once tests have been updated
Fix the tests to use the new callback style, and add a test for the get or add function