- add additional tests, improvements