tests updated to work with requirejs, rearranged files