Bug fix tests