Do not allow undefined / null ids
Merge branch 'new-api' into new-api-bin
Better mock filenames
Mock functions that take an id
Naming convention