Updated test, timeslot ddl
Merge branch 'master' into Anirup