Run source-loader to get correct order of files in karma
Fixup tests