- added some more tests + better dev error management