fix: test fixes

packages/client/src/components/Root.js

@@ -70,8 +70,10 @@ const Root = ({
     <Provider store={store}>
       <ConnectedRouter history={history}>
         <ThemeProvider theme={theme}>
-          <Normalize />
-          <StyleRoot>{routes}</StyleRoot>
+          <StyleRoot>
+            <Normalize />
+            {routes}
+          </StyleRoot>
         </ThemeProvider>
       </ConnectedRouter>
     </Provider>

packages/styleguide/package.json

@@ -23,6 +23,7 @@
     "redux": "^3.6.0",
     "redux-form": "^7.0.3",
     "styled-components": "^4.1.1",
+    "styled-normalize": "^3.0.1",
     "xpub-journal": "^0.0.3"
   },
   "devDependencies": {

packages/styleguide/src/components/StyleGuideRenderer.js

@@ -2,7 +2,7 @@ import React from 'react'
 import _ from 'lodash'
 import 'regenerator-runtime/runtime'
 import styled, { css, ThemeProvider } from 'styled-components'
-import { Button, Menu, GlobalStyles } from '@pubsweet/ui'
+import { Button, Menu, GlobalStyle } from '@pubsweet/ui'
 import { th } from '@pubsweet/ui-toolkit'
 import StyleRoot from 'pubsweet-client/src/helpers/StyleRoot'
 import { Normalize } from 'styled-normalize'
@@ -189,7 +189,7 @@ class StyleGuideRenderer extends React.Component {
       <ThemeProvider theme={themes[this.state.themeName]}>
         <StyleRoot>
           <Normalize />
-          <GlobalStyles />
+          <GlobalStyle />
           <Root>
             <Sidebar>
               <Header>