- fixed a bug when the file location was null (i.e. remove was called and the system was never initialized)
- fixed some tests which still used model as modelname, model is since yesterday a keyword