bugfix, more tests