Bugfix
More tests