Re-adding tests from rebase

 * Makes the notification plan ID general
 * Adds list data point test coverage