Added additional testing