Fixing tests, amd => umd, dependencies