bugfix n tests: