Fixed notice; expanded tests.