Bugfix tests