Updated tests for Cameron Bielstein (cameronb) and Doug Goldstein (ddg625)