Fixed notice; added tests.