@dsaff 
@kcooney 
Simplified in last commit. Did not change the tests performance.