Made tests for container events a bit tighter