Bugfix, more tests