moved this code into its own library
Added a Schedule specific exception
updated test group annotations