Fixed false positive tests