Update comments and logging
Slow down tests for better reliability