CS fixes. Expanded test coverage to include the 'notify' attributes