make sure not found works + add tests
make create/delete system only add tests