Strict standards; expanded test.