Bugfix and one more test added