tests revealed issues

... fixed