Block: Add test scheduler again