Add some better tests for listing and adding