deadline acceptens tests
Merge remote-tracking branch 'origin/mishael'