Cleanup comments
Rename resource package to controller
Rename resource package to controller
make testdata package
refactor test data method names
Merge in date_time schedule code