Thx! Can you please switch over to https://github.com/edx/edx-platform/issues/1856 ?

BLD-465 stuff has moved there. Basically a copy of things from here, without @olmar 's tests. That PR has fixes for all your comments from here.

Thx!