beefed up identification tests a bit