Adding bdb2426's tests