some additional tests and minor bugfixes