Fixing bug in loader when separator is part of the prefix, coding style, fixing bug in router, adding more loader tests