Fixes #71 (random test fails), removes dependency on TestingBundle

Fixes #71
Add comments