WIP
Jasmine tests and refactor the commercial loader