fixed promise bug
moved mock files to test/mock, exposes loadCustomScript to cli
refactored some ugly stuff