Alex

I can't reproduce the failing tests, could I be missing something?

When I execute them locally they all pass

@CyrusNajmabadi suggestions in place ptal

@CyrusNajmabadi ready for review with resolved comments