diff --git a/client/coral-admin/src/components/ActionsMenu.js b/client/coral-admin/src/components/ActionsMenu.js
index 25aee1fbc..6351afda7 100644
--- a/client/coral-admin/src/components/ActionsMenu.js
+++ b/client/coral-admin/src/components/ActionsMenu.js
@@ -32,8 +32,9 @@ class ActionsMenu extends React.Component {
   };
 
   render() {
+    const {className = ''} = this.props;
     return (
-      <div className={styles.root} onBlur={this.syncOpenState} >
+      <div className={cn(styles.root, className)} onBlur={this.syncOpenState} >
         <Button
           cStyle='actions'
           className={cn(styles.button, {[styles.buttonOpen]: this.state.open})}
@@ -59,6 +60,7 @@ class ActionsMenu extends React.Component {
 ActionsMenu.propTypes = {
   icon: PropTypes.string,
   children: PropTypes.node,
+  className: PropTypes.string,
 };
 
 export default ActionsMenu;
diff --git a/client/coral-admin/src/components/ActionsMenuItem.js b/client/coral-admin/src/components/ActionsMenuItem.js
index d9497a6ce..2bb9fa645 100644
--- a/client/coral-admin/src/components/ActionsMenuItem.js
+++ b/client/coral-admin/src/components/ActionsMenuItem.js
@@ -3,12 +3,14 @@ import cn from 'classnames';
 import {MenuItem} from 'react-mdl';
 import PropTypes from 'prop-types';
 import styles from './ActionsMenu.css';
+import camelCase from 'lodash/camelCase';
 
 const ActionsMenuItem = (props) =>
-  <MenuItem className={cn(styles.menuItem, props.className)} {...props} />;
-
+  <MenuItem className={cn(styles.menuItem, props.className, 'action-menu-item')} {...props} id={camelCase(props.children)}/>;
+  
 ActionsMenuItem.propTypes = {
   className: PropTypes.string,
+  children: PropTypes.string,
 };
 
 export default ActionsMenuItem;
diff --git a/client/coral-admin/src/components/ApproveButton.js b/client/coral-admin/src/components/ApproveButton.js
index 151a5ca29..8ab455510 100644
--- a/client/coral-admin/src/components/ApproveButton.js
+++ b/client/coral-admin/src/components/ApproveButton.js
@@ -7,11 +7,11 @@ import {Icon} from 'coral-ui';
 
 import t from 'coral-framework/services/i18n';
 
-const ApproveButton = ({active, minimal, onClick}) => {
+const ApproveButton = ({active, minimal, onClick, className}) => {
   const text = active ? t('modqueue.approved') : t('modqueue.approve');
   return (
     <button
-      className={cn(styles.root, {[styles.minimal]: minimal, [styles.active]: active})}
+      className={cn(styles.root, {[styles.minimal]: minimal, [styles.active]: active}, className)}
       onClick={onClick}
     >
       <Icon name={'done'} className={styles.icon} />
@@ -21,6 +21,7 @@ const ApproveButton = ({active, minimal, onClick}) => {
 };
 
 ApproveButton.propTypes = {
+  className: PropTypes.string,
   active: PropTypes.bool,
   minimal: PropTypes.bool,
   onClick: PropTypes.func,
diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js
index 169afe043..61fa3ca9d 100644
--- a/client/coral-admin/src/components/BanUserDialog.js
+++ b/client/coral-admin/src/components/BanUserDialog.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import cn from 'classnames';
 import PropTypes from 'prop-types';
 import {Dialog} from 'coral-ui';
 import styles from './BanUserDialog.css';
@@ -8,28 +9,34 @@ import t from 'coral-framework/services/i18n';
 
 const BanUserDialog = ({open, onCancel, onPerform, username, info}) => (
   <Dialog
-    className={styles.dialog}
+    className={cn(styles.dialog, 'talk-ban-user-dialog')}
     id="banUserDialog"
     open={open}
     onCancel={onCancel}
     title={t('bandialog.ban_user')}>
     <span className={styles.close} onClick={onCancel}>×</span>
-    <div>
-      <div className={styles.header}>
-        <h2>{t('bandialog.ban_user')}</h2>
-      </div>
-      <div className={styles.separator}>
-        <h3>{t('bandialog.are_you_sure', username)}</h3>
-        <i>{info}</i>
-      </div>
-      <div className={styles.buttons}>
-        <Button cStyle="cancel" className={styles.cancel} onClick={onCancel} raised>
-          {t('bandialog.cancel')}
-        </Button>
-        <Button cStyle="black" className={styles.ban} onClick={onPerform} raised>
-          {t('bandialog.yes_ban_user')}
-        </Button>
-      </div>
+    <div className={styles.header}>
+      <h2>{t('bandialog.ban_user')}</h2>
+    </div>
+    <div className={styles.separator}>
+      <h3>{t('bandialog.are_you_sure', username)}</h3>
+      <i>{info}</i>
+    </div>
+    <div className={styles.buttons}>
+      <Button
+        className={cn(styles.cancel, 'talk-ban-user-dialog-button-cancel')}
+        cStyle="cancel"
+        onClick={onCancel}
+        raised >
+        {t('bandialog.cancel')}
+      </Button>
+      <Button 
+        className={cn(styles.ban, 'talk-ban-user-dialog-button-confirm')}
+        cStyle="black"
+        onClick={onPerform}
+        raised >
+        {t('bandialog.yes_ban_user')}
+      </Button>
     </div>
   </Dialog>
 );
diff --git a/client/coral-admin/src/components/CommentBodyHighlighter.js b/client/coral-admin/src/components/CommentBodyHighlighter.js
index e27d3ce6d..177df5338 100644
--- a/client/coral-admin/src/components/CommentBodyHighlighter.js
+++ b/client/coral-admin/src/components/CommentBodyHighlighter.js
@@ -15,7 +15,15 @@ function generateRegExp(phrases) {
         .join('[\\s"?!.]+')
     ).join('|');
 
-  return new RegExp(`(^|[^\\w])(${inner})(?=[^\\w]|$)`, 'iu');
+  const pattern = `(^|[^\\w])(${inner})(?=[^\\w]|$)`;
+  try {
+    return new RegExp(pattern, 'iu');
+  }
+  catch (_err) {
+
+    // IE does not support unicode support, so we'll create one without.
+    return new RegExp(pattern, 'i');
+  }
 }
 
 // Generate a regular expression detecting `suspectWords` and `bannedWords` phrases.
diff --git a/client/coral-admin/src/components/RejectButton.js b/client/coral-admin/src/components/RejectButton.js
index e01102dc3..8e0873162 100644
--- a/client/coral-admin/src/components/RejectButton.js
+++ b/client/coral-admin/src/components/RejectButton.js
@@ -7,11 +7,11 @@ import {Icon} from 'coral-ui';
 
 import t from 'coral-framework/services/i18n';
 
-const RejectButton = ({active, minimal, onClick}) => {
+const RejectButton = ({active, minimal, onClick, className}) => {
   const text = active ? t('modqueue.rejected') : t('modqueue.reject');
   return (
     <button
-      className={cn(styles.root, {[styles.minimal]: minimal, [styles.active]: active})}
+      className={cn(styles.root, {[styles.minimal]: minimal, [styles.active]: active}, className)}
       onClick={onClick}
     >
       <Icon name={'close'} className={styles.icon} />
@@ -21,6 +21,7 @@ const RejectButton = ({active, minimal, onClick}) => {
 };
 
 RejectButton.propTypes = {
+  className: PropTypes.string,
   active: PropTypes.bool,
   minimal: PropTypes.bool,
   onClick: PropTypes.func,
diff --git a/client/coral-admin/src/components/SuspendUserDialog.js b/client/coral-admin/src/components/SuspendUserDialog.js
index d56201e2f..cfff3b17e 100644
--- a/client/coral-admin/src/components/SuspendUserDialog.js
+++ b/client/coral-admin/src/components/SuspendUserDialog.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import {Dialog} from 'coral-ui';
 import {RadioGroup, Radio} from 'react-mdl';
 import styles from './SuspendUserDialog.css';
+import cn from 'classnames';
 
 import Button from 'coral-ui/components/Button';
 
@@ -87,7 +88,7 @@ class SuspendUserDialog extends React.Component {
           <Button cStyle="white" className={styles.cancel} onClick={onCancel} raised>
             {t('suspenduser.cancel')}
           </Button>
-          <Button cStyle="black" className={styles.perform} onClick={this.goToStep1} raised>
+          <Button cStyle="black" className={cn(styles.perform, 'talk-admin-suspend-user-dialog-confirm')} onClick={this.goToStep1} raised>
             {t('suspenduser.suspend_user')}
           </Button>
         </div>
@@ -120,7 +121,7 @@ class SuspendUserDialog extends React.Component {
           </Button>
           <Button
             cStyle="black"
-            className={styles.perform}
+            className={cn(styles.perform, 'talk-admin-suspend-user-dialog-send')}
             onClick={this.handlePerform}
             disabled={this.state.message.length === 0}
             raised
@@ -137,7 +138,7 @@ class SuspendUserDialog extends React.Component {
     const {step} = this.state;
     return (
       <Dialog
-        className={styles.dialog}
+        className={cn(styles.dialog, 'talk-admin-suspend-user-dialog')}
         onCancel={onCancel}
         open={open}
       >
diff --git a/client/coral-admin/src/components/ui/Header.js b/client/coral-admin/src/components/ui/Header.js
index c5af63786..bd7fbcf0c 100644
--- a/client/coral-admin/src/components/ui/Header.js
+++ b/client/coral-admin/src/components/ui/Header.js
@@ -76,9 +76,9 @@ const CoralHeader = ({
           }
           <div className={styles.rightPanel}>
             <ul>
-              <li className={styles.settings}>
+              <li className={cn(styles.settings, 'talk-admin-header-settings')}>
                 <div>
-                  <IconButton name="settings" id="menu-settings"/>
+                  <IconButton name="settings" id="menu-settings" className="talk-admin-header-settings-button"/>
                   <Menu target="menu-settings" align="right">
                     <MenuItem onClick={() => showShortcuts(true)}>{t('configure.shortcuts')}</MenuItem>
                     <MenuItem>
@@ -91,7 +91,7 @@ const CoralHeader = ({
                           Report a bug or give feedback
                       </a>
                     </MenuItem>
-                    <MenuItem onClick={handleLogout}>
+                    <MenuItem onClick={handleLogout} className="talk-admin-header-sign-out">
                       {t('configure.sign_out')}
                     </MenuItem>
                   </Menu>
diff --git a/client/coral-admin/src/containers/SuspendUserDialog.js b/client/coral-admin/src/containers/SuspendUserDialog.js
index 12e9843b4..3d5283df9 100644
--- a/client/coral-admin/src/containers/SuspendUserDialog.js
+++ b/client/coral-admin/src/containers/SuspendUserDialog.js
@@ -1,4 +1,5 @@
 import React, {Component} from 'react';
+import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import SuspendUserDialog from '../components/SuspendUserDialog';
@@ -44,6 +45,12 @@ class SuspendUserDialogContainer extends Component {
   }
 }
 
+SuspendUserDialogContainer.propTypes = {
+  open: PropTypes.bool,
+  hideSuspendUserDialog: PropTypes.func,
+  username: PropTypes.object,
+};
+
 const withOrganizationName = withQuery(gql`
   query CoralAdmin_SuspendUserDialog {
       __typename
diff --git a/client/coral-admin/src/routes/Community/components/CommunityMenu.js b/client/coral-admin/src/routes/Community/components/CommunityMenu.js
index 3e13617fe..251762b43 100644
--- a/client/coral-admin/src/routes/Community/components/CommunityMenu.js
+++ b/client/coral-admin/src/routes/Community/components/CommunityMenu.js
@@ -13,11 +13,11 @@ const CommunityMenu = ({flaggedUsernamesCount = 0}) => {
     <div className='mdl-tabs'>
       <div className={`mdl-tabs__tab-bar ${styles.tabBar}`}>
         <div>
-          <Link to={flaggedPath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+          <Link to={flaggedPath} className={`mdl-tabs__tab ${styles.tab} talk-admin-nav-flagged-accounts`} activeClassName={styles.active}>
             {t('community.flaggedaccounts')}
             <CountBadge count={flaggedUsernamesCount} />
           </Link>
-          <Link to={peoplePath} className={`mdl-tabs__tab ${styles.tab}`} activeClassName={styles.active}>
+          <Link to={peoplePath} className={`mdl-tabs__tab ${styles.tab} talk-admin-nav-people`} activeClassName={styles.active}>
             {t('community.people')}
           </Link>
         </div>
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
index e617def53..cbfd903c6 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedAccounts.js
@@ -1,5 +1,6 @@
 import React from 'react';
-
+import PropTypes from 'prop-types';
+import cn from 'classnames';
 import t from 'coral-framework/services/i18n';
 import EmptyCard from 'coral-admin/src/components/EmptyCard';
 import LoadMore from '../../../components/LoadMore';
@@ -23,7 +24,7 @@ class FlaggedAccounts extends React.Component {
     const hasResults = users.nodes && !!users.nodes.length;
 
     return (
-      <div className={styles.container}>
+      <div className={cn('talk-adnin-community-flagged-accounts', styles.container)}>
         <div className={styles.mainFlaggedContent}>
           {
             hasResults
@@ -70,4 +71,15 @@ class FlaggedAccounts extends React.Component {
   }
 }
 
+FlaggedAccounts.propTypes = {
+  users: PropTypes.object,
+  loadMore: PropTypes.func,
+  showBanUserDialog: PropTypes.func,
+  showSuspendUserDialog: PropTypes.func,
+  showRejectUsernameDialog: PropTypes.func,
+  approveUser: PropTypes.func,
+  me: PropTypes.object,
+  viewUserDetail: PropTypes.func,
+};
+
 export default FlaggedAccounts;
diff --git a/client/coral-admin/src/routes/Community/components/FlaggedUser.js b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
index 409e867a3..b2156f479 100644
--- a/client/coral-admin/src/routes/Community/components/FlaggedUser.js
+++ b/client/coral-admin/src/routes/Community/components/FlaggedUser.js
@@ -1,18 +1,14 @@
 import React from 'react';
 import styles from './FlaggedUser.css';
-
-// TODO: Should not rely on plugin.
+import PropTypes from 'prop-types';
+import cn from 'classnames';
+import t from 'coral-framework/services/i18n';
 import {username} from 'talk-plugin-flags/helpers/flagReasons';
-
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import ApproveButton from 'coral-admin/src/components/ApproveButton';
 import RejectButton from 'coral-admin/src/components/RejectButton';
 
-import cn from 'classnames';
-import t from 'coral-framework/services/i18n';
-
-// TODO: Should work with custom flags too.
 const shortReasons = {
   [username.other]: t('community.other'),
   [username.spam]: t('community.spam_ads'),
@@ -21,7 +17,6 @@ const shortReasons = {
   [username.impersonating]: t('community.impersonating'),
 };
 
-// Render a single user for the list
 class User extends React.Component {
 
   showSuspenUserDialog = () => this.props.showSuspendUserDialog({
@@ -50,12 +45,10 @@ class User extends React.Component {
     } = this.props;
 
     return (
-      <li
-        tabIndex={0}
-        className={cn(className, styles.root, {[styles.rootSelected]: selected})}
-      >
-        <div className={styles.container}>
-          <div className={styles.header}>
+      <li tabIndex={0}
+        className={cn(className, styles.root, {[styles.rootSelected]: selected})} >
+        <div className={cn('talk-admin-community-flagged-user', styles.container)}>
+          <div className={cn('talk-admin-community-flagged-user-header', styles.header)}>
             <div className={styles.author}>
               <button
                 onClick={this.viewAuthorDetail}
@@ -78,8 +71,7 @@ class User extends React.Component {
               }
             </div>
           </div>
-
-          <div className={styles.body}>
+          <div className={cn('talk-admin-community-flagged-user-body', styles.body)}>
             <div className={styles.flagged}>
               <div className={styles.flaggedByCount}>
                 <i className={cn('material-icons', styles.flagIcon)}>flag</i>
@@ -127,9 +119,11 @@ class User extends React.Component {
             <div className={styles.sideActions}>
               <div className={styles.actions}>
                 <ApproveButton
+                  className="talk-admin-flagged-user-approve-button"
                   onClick={this.approveUser}
                 />
                 <RejectButton
+                  className="talk-admin-flagged-user-reject-button"
                   onClick={this.showRejectUsernameDialog}
                 />
               </div>
@@ -141,4 +135,16 @@ class User extends React.Component {
   }
 }
 
+User.propTypes = {
+  showSuspendUserDialog: PropTypes.func,
+  showBanUserDialog: PropTypes.func,
+  viewUserDetail: PropTypes.func,
+  showRejectUsernameDialog: PropTypes.func,
+  approveUser: PropTypes.func,
+  user: PropTypes.object,
+  className: PropTypes.string,
+  selected: PropTypes.bool,
+  me: PropTypes.object,
+};
+
 export default User;
diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js
index 75d08429a..b92bd679a 100644
--- a/client/coral-admin/src/routes/Community/components/People.js
+++ b/client/coral-admin/src/routes/Community/components/People.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import cn from 'classnames';
 import styles from './styles.css';
 import Table from './Table';
 import {Icon} from 'coral-ui';
@@ -24,7 +25,7 @@ const People = (props) => {
   const hasResults = !!users.length;
 
   return (
-    <div className={styles.container}>
+    <div className={cn(styles.container, 'talk-admin-community-people-container')}>
       <div className={styles.leftColumn}>
         <div className={styles.searchBox}>
           <Icon name='search' className={styles.searchIcon}/>
diff --git a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
index 20c411e52..18e9394a5 100644
--- a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
@@ -1,6 +1,6 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-
+import cn from 'classnames';
 import {Dialog, Button} from 'coral-ui';
 import styles from './RejectUsernameDialog.css';
 
@@ -29,12 +29,6 @@ class RejectUsernameDialog extends Component  {
 
   state = {email: '', stage: 0}
 
-  static propTypes = {
-    stage: PropTypes.number,
-    handleClose: PropTypes.func.isRequired,
-    rejectUsername: PropTypes.func.isRequired
-  }
-
   componentDidMount() {
     this.setState({email: t('reject_username.email_message_reject'), about: t('reject_username.username')});
   }
@@ -76,7 +70,7 @@ class RejectUsernameDialog extends Component  {
     const {stage} = this.state;
 
     return <Dialog
-      className={styles.suspendDialog}
+      className={cn(styles.suspendDialog, 'talk-reject-username-dialog')}
       id="rejectUsernameDialog"
       open={open}
       onClose={handleClose}
@@ -96,15 +90,18 @@ class RejectUsernameDialog extends Component  {
                   <div className={styles.emailContainer}>
                     <textarea
                       rows={5}
-                      className={styles.emailInput}
+                      className={cn(styles.emailInput, 'talk-reject-username-dialog-suspension-message')}
                       value={this.state.email}
                       onChange={this.onEmailChange}/>
                   </div>
                 </div>
         }
-        <div className={styles.modalButtons}>
+        <div className={cn(styles.modalButtons, 'talk-reject-username-dialog-buttons')}>
           {Object.keys(stages[stage].options).map((key, i) => (
-            <Button key={i} onClick={this.onActionClick(stage, i)}>
+            <Button
+              key={i}
+              className={cn('talk-reject-username-dialog-button', `talk-reject-username-dialog-button-${key}`)}
+              onClick={this.onActionClick(stage, i)} >
               {t(stages[stage].options[key], t('reject_username.username'))}
             </Button>
           ))}
@@ -114,4 +111,12 @@ class RejectUsernameDialog extends Component  {
   }
 }
 
+RejectUsernameDialog.propTypes = {
+  stage: PropTypes.number,
+  handleClose: PropTypes.func.isRequired,
+  rejectUsername: PropTypes.func.isRequired,
+  user: PropTypes.object,
+  open: PropTypes.bool,
+};
+
 export default RejectUsernameDialog;
diff --git a/client/coral-admin/src/routes/Community/components/Table.js b/client/coral-admin/src/routes/Community/components/Table.js
index 22b02cfe4..89d59131e 100644
--- a/client/coral-admin/src/routes/Community/components/Table.js
+++ b/client/coral-admin/src/routes/Community/components/Table.js
@@ -42,7 +42,7 @@ const Table = ({users, setRole, onHeaderClickHandler, setCommenterStatus, viewUs
       </thead>
       <tbody>
         {users.map((row, i)=> (
-          <tr key={i}>
+          <tr key={i} className="talk-admin-community-people-row">
             <td className="mdl-data-table__cell--non-numeric">
               <button onClick={() => {viewUserDetail(row.id);}} className={cn(styles.username, styles.button)}>{row.username}</button>
               <span className={styles.email}>{row.profiles.map(({id}) => id)}</span>
@@ -52,6 +52,7 @@ const Table = ({users, setRole, onHeaderClickHandler, setCommenterStatus, viewUs
             </td>
             <td className="mdl-data-table__cell--non-numeric">
               <Dropdown
+                containerClassName="talk-admin-community-people-dd-status"
                 value={row.status}
                 placeholder={t('community.status')}
                 onChange={(status) => setCommenterStatus(row.id, status)}>
@@ -61,6 +62,7 @@ const Table = ({users, setRole, onHeaderClickHandler, setCommenterStatus, viewUs
             </td>
             <td className="mdl-data-table__cell--non-numeric">
               <Dropdown
+                containerClassName="talk-admin-community-people-dd-role"
                 value={row.roles[0] || ''}
                 placeholder={t('community.role')}
                 onChange={(role) => setRole(row.id, role)}>
diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js
index aedc69739..cea49720b 100644
--- a/client/coral-admin/src/routes/Moderation/components/Comment.js
+++ b/client/coral-admin/src/routes/Moderation/components/Comment.js
@@ -73,7 +73,7 @@ class Comment extends React.Component {
     return (
       <li
         tabIndex={0}
-        className={cn(className, 'mdl-card', selectionStateCSS, styles.root, {[styles.selected]: selected})}
+        className={cn(className, 'mdl-card', selectionStateCSS, styles.root, {[styles.selected]: selected}, 'talk-admin-moderate-comment')}
         id={`comment_${comment.id}`}
       >
         <div className={styles.container}>
@@ -95,7 +95,7 @@ class Comment extends React.Component {
                   : null
               }
               {currentUserId !== comment.user.id &&
-                <ActionsMenu icon="not_interested">
+                <ActionsMenu icon="not_interested" className="talk-admin-moderate-comment-actions-menu">
                   <ActionsMenuItem
                     disabled={comment.user.status === 'BANNED'}
                     onClick={this.showSuspendUserDialog}>
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
index 1161ad5dc..200e5f6ae 100644
--- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js
+++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js
@@ -71,10 +71,10 @@ class ModerationContainer extends Component {
     const id = getAssetId(this.props);
     const tab = getTab(this.props);
 
-    // Grab premod from asset or from settings
-    const premod = !id ? settings.moderation : asset.settings.moderation;
+    // Grab premod from asset or from settings if it's defined.
+    const setting = id && asset && asset.settings ? asset.settings.moderation : settings.moderation;
 
-    const queue = isPremod(premod) ? 'premod' : 'new';
+    const queue = isPremod(setting) ? 'premod' : 'new';
     const activeTab = tab ? tab : queue;
 
     return activeTab;
diff --git a/client/coral-embed-stream/src/components/Stream.js b/client/coral-embed-stream/src/components/Stream.js
index 96101c1e5..7ff48106b 100644
--- a/client/coral-embed-stream/src/components/Stream.js
+++ b/client/coral-embed-stream/src/components/Stream.js
@@ -213,12 +213,14 @@ class Stream extends React.Component {
     const open = !asset.isClosed;
 
     const banned = user && user.status === 'BANNED';
+    const pending = user && user.status === 'PENDING';
+
     const temporarilySuspended =
       user &&
       user.suspension.until &&
       new Date(user.suspension.until) > new Date();
 
-    const showCommentBox = loggedIn && ((!banned && !temporarilySuspended && !highlightedComment) || keepCommentBox);
+    const showCommentBox = loggedIn && ((!banned && !pending & !temporarilySuspended && !highlightedComment) || keepCommentBox);
     const slotProps = {data};
     const slotQueryData = {root, asset};
 
diff --git a/client/coral-embed-stream/src/components/SuspendAccount.css b/client/coral-embed-stream/src/components/SuspendAccount.css
index f491ea889..539df0812 100644
--- a/client/coral-embed-stream/src/components/SuspendAccount.css
+++ b/client/coral-embed-stream/src/components/SuspendAccount.css
@@ -1,6 +1,10 @@
 .editNameInput {
   margin-top: 10px;
   margin-bottom: 10px;
+  padding: 10px;
+  border-radius: 3px;
+  border: solid 1px #d8d8d8;
+  font-size: 0.9em;
 }
 
 .alert {
diff --git a/client/coral-embed-stream/src/components/SuspendedAccount.js b/client/coral-embed-stream/src/components/SuspendedAccount.js
index 903b1bcf4..ce9a1c23c 100644
--- a/client/coral-embed-stream/src/components/SuspendedAccount.js
+++ b/client/coral-embed-stream/src/components/SuspendedAccount.js
@@ -1,5 +1,6 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
+import cn from 'classnames';
 import t from 'coral-framework/services/i18n';
 import styles from './SuspendAccount.css';
 import {Button} from 'coral-ui';
@@ -66,17 +67,16 @@ class SuspendedAccount extends Component {
             </label>
             <input
               type='text'
-              className={styles.editNameInput}
+              className={cn(styles.editNameInput, 'talk-suspended-account-username-input')}
               value={username}
               placeholder={t('framework.edit_name.label')}
               id='username'
               onChange={(e) => this.setState({username: e.target.value})}
               rows={3}/><br/>
             <Button
-              onClick={this.onSubmitClick}>
-              {
-                t('framework.edit_name.button')
-              }
+              className="talk-suspended-account-submit-button"
+              onClick={this.onSubmitClick} >
+              {t('framework.edit_name.button')}
             </Button>
           </div> : null
       }
diff --git a/client/coral-framework/components/RestrictedContent.js b/client/coral-framework/components/RestrictedContent.js
index 01c5ddd93..02df566a4 100644
--- a/client/coral-framework/components/RestrictedContent.js
+++ b/client/coral-framework/components/RestrictedContent.js
@@ -1,16 +1,25 @@
 import React from 'react';
-
+import PropTypes from 'prop-types';
 import t from 'coral-framework/services/i18n';
 import RestrictedMessageBox from './RestrictedMessageBox';
 
-export default ({children, restricted, message = t('framework.content_not_available'), restrictedComp}) => {
+const RestrictedContent = ({children, restricted, message = t('framework.content_not_available'), restrictedComp}) => {
   if (restricted) {
     return restrictedComp ? restrictedComp : <RestrictedMessageBox message={message} />;
   } else {
     return (
-      <div>
+      <div className="talk-restricted-content">
         {children}
       </div>
     );
   }
 };
+
+RestrictedContent.propTypes = {
+  children: PropTypes.node,
+  restricted: PropTypes.bool,
+  message: PropTypes.string,
+  restrictedComp: PropTypes.node,
+};
+
+export default RestrictedContent;
diff --git a/client/coral-framework/components/RestrictedMessageBox.js b/client/coral-framework/components/RestrictedMessageBox.js
index c579a4731..05c8c89aa 100644
--- a/client/coral-framework/components/RestrictedMessageBox.js
+++ b/client/coral-framework/components/RestrictedMessageBox.js
@@ -1,4 +1,13 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import cn from 'classnames';
 import styles from './RestrictedMessageBox.css';
 
-export default ({children}) => <div className={styles.message}>{children}</div>;
+const RestrictedMessageBox = ({children}) => 
+  <div className={cn(styles.message, 'talk-restricted-message-box')}>{children}</div>;
+
+RestrictedMessageBox.propTypes = {
+  children: PropTypes.node,
+};
+
+export default RestrictedMessageBox;
diff --git a/client/coral-ui/components/Dialog.js b/client/coral-ui/components/Dialog.js
index 93431db4c..a7d34a512 100644
--- a/client/coral-ui/components/Dialog.js
+++ b/client/coral-ui/components/Dialog.js
@@ -10,12 +10,12 @@ export default class Dialog extends Component {
     onCancel: PropTypes.func,
     onClose: PropTypes.func,
     open: PropTypes.bool,
-    style: PropTypes.object
+    style: PropTypes.object,
   };
 
   static defaultProps = {
     onCancel: (e) => e.preventDefault(),
-    onClose: (e) => e.preventDefault()
+    onClose: (e) => e.preventDefault(),
   };
 
   componentDidMount(){
diff --git a/client/coral-ui/components/Dropdown.js b/client/coral-ui/components/Dropdown.js
index 2cad6e990..dddffbfa2 100644
--- a/client/coral-ui/components/Dropdown.js
+++ b/client/coral-ui/components/Dropdown.js
@@ -131,7 +131,7 @@ class Dropdown extends React.Component {
     const {containerClassName, toggleClassName, toggleOpenClassName} = this.props;
     return (
       <ClickOutside onClickOutside={this.hideMenu}>
-        <div className={cn(styles.dropdown, containerClassName)}>
+        <div className={cn(styles.dropdown, containerClassName, 'dd dd-container')}>
           <div
             className={cn(styles.toggle, toggleClassName, {[cn(this.state.isOpen, toggleOpenClassName)]: this.state.isOpen})}
             onClick={this.handleClick}
@@ -149,7 +149,7 @@ class Dropdown extends React.Component {
           {this.state.isOpen &&
             <div>
               <div tabIndex="0" onFocus={this.trapFocusBegin} />
-              <ul className={cn(styles.list, {[styles.listActive] : this.state.isOpen})}>
+              <ul className={cn(styles.list, {[styles.listActive] : this.state.isOpen}, 'dd-list-active')}>
                 {React.Children.toArray(this.props.children)
                   .map((child, i) =>
                     React.cloneElement(child, {
diff --git a/client/coral-ui/components/Option.js b/client/coral-ui/components/Option.js
index 5b752eb48..8fd92a904 100644
--- a/client/coral-ui/components/Option.js
+++ b/client/coral-ui/components/Option.js
@@ -16,8 +16,9 @@ class Option extends React.Component {
 
   render() {
     const {className, label = '', onClick, onKeyDown} = this.props;
+    const id = this.props.id ? this.props.id : this.props.value;
     return (
-      <li className={cn(styles.option, className)} onClick={onClick} onKeyDown={onKeyDown} role="option" tabIndex="0" ref={this.handleRef}>
+      <li className={cn(styles.option, className, 'dd-option')} onClick={onClick} onKeyDown={onKeyDown} role="option" tabIndex="0" ref={this.handleRef} id={id}>
         {label}
       </li>
     );
@@ -26,6 +27,7 @@ class Option extends React.Component {
 
 Option.propTypes = {
   className: PropTypes.string,
+  id: PropTypes.string,
   label: PropTypes.string,
   onClick: PropTypes.func,
   onKeyDown: PropTypes.func,
diff --git a/docs/_docs/02-02-advanced-configuration.md b/docs/_docs/02-02-advanced-configuration.md
index 73e72e2cb..74099258d 100644
--- a/docs/_docs/02-02-advanced-configuration.md
+++ b/docs/_docs/02-02-advanced-configuration.md
@@ -369,12 +369,12 @@ Then all the routes for the API will be expecting to be hit on `/talk/`, such as
 can perform the path stripping when serving an upstream proxy, but some CDN's
 cannot. You would use this option in the latter situation.
 
-## TALK_SMTP_EMAIL
+## TALK_SMTP_FROM_ADDRESS
 
 The email address to send emails from using the SMTP provider in the format:
 
 ```plain
-TALK_SMTP_EMAIL="The Coral Project" <support@coralproject.net>
+TALK_SMTP_FROM_ADDRESS="The Coral Project" <support@coralproject.net>
 ```
 
 Including the name and email address.
diff --git a/nightwatch-browserstack.conf.js b/nightwatch-browserstack.conf.js
index d79f6917a..f31580988 100644
--- a/nightwatch-browserstack.conf.js
+++ b/nightwatch-browserstack.conf.js
@@ -22,11 +22,12 @@ const nightwatch_config = {
         'browserstack.user': process.env.BROWSERSTACK_USER || 'coralproject2',
         'browserstack.key': process.env.BROWSERSTACK_KEY,
         'browserstack.local': true,
+        'browserstack.localIdentifier': process.env.BROWSERSTACK_LOCAL_IDENTIFIER ? process.env.BROWSERSTACK_LOCAL_IDENTIFIER : undefined,
         'browserstack.debug': true,
 
         // Disable this, as it makes bs slow and brittle.
         'browserstack.networkLogs': false,
-        'browserstack.resolution': '1600x1200',
+        'resolution': '1600x1200',
       },
       screenshots : {
         enabled: true,
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index 97eee0e81..e04cc04a8 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -40,6 +40,8 @@ module.exports = {
         path: process.env.REPORTS_FOLDER || './test/e2e/reports',
       },
     },
+    'chrome': {
+    },
     'chrome-headless': {
       desiredCapabilities: {
         chromeOptions : {
diff --git a/package.json b/package.json
index 897efc819..69093c0c5 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,7 @@
     "lint-fix": "yarn lint --fix",
     "jest-watch": "TEST_MODE=unit NODE_ENV=test jest --watch",
     "e2e-ci": "./scripts/e2e-ci.sh",
-    "e2e-browserstack": "NODE_ENV=test ./scripts/e2e-browserstack.js --config nightwatch-browserstack.conf.js",
-    "pree2e": "selenium-standalone install",
-    "e2e": "NODE_ENV=test nightwatch",
+    "e2e": "./scripts/e2e.js",
     "test": "TEST_MODE=unit NODE_ENV=test jest && TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}",
     "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec",
     "heroku-postbuild": "./bin/cli plugins reconcile && yarn build",
diff --git a/plugins/talk-plugin-moderation-actions/client/components/ApproveCommentAction.js b/plugins/talk-plugin-moderation-actions/client/components/ApproveCommentAction.js
index f683acae6..125a3589e 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/ApproveCommentAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/ApproveCommentAction.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import styles from './styles.css';
 import {t} from 'plugin-api/beta/client/services';
 import {Icon} from 'plugin-api/beta/client/components/ui';
@@ -6,16 +7,23 @@ import cn from 'classnames';
 
 const isApproved = (status) => (status === 'ACCEPTED');
 
-export default ({approveComment, comment: {status}}) => (
+const ApproveCommentAction = ({approveComment, comment: {status}}) => (
   isApproved(status) ? (
     <span className={styles.approved}>
       <Icon name="check_circle" className={styles.icon} />
       {t('talk-plugin-moderation-actions.approved_comment')}
     </span>
   ) : (
-    <button className={cn(styles.button, 'talk-plugin-moderation-actions-reject')} onClick={approveComment}>
+    <button className={cn(styles.button, 'talk-plugin-moderation-actions-approve')} onClick={approveComment}>
       <Icon name="done" className={styles.icon} />
       {t('talk-plugin-moderation-actions.approve_comment')}
     </button>
   )
 );
+
+ApproveCommentAction.propTypes = {
+  approveComment: PropTypes.func,
+  comment: PropTypes.object,
+};
+
+export default ApproveCommentAction;
\ No newline at end of file
diff --git a/plugins/talk-plugin-moderation-actions/client/components/BanUserAction.js b/plugins/talk-plugin-moderation-actions/client/components/BanUserAction.js
index 36f9b1489..75956a0b6 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/BanUserAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/BanUserAction.js
@@ -1,14 +1,21 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import styles from './styles.css';
 import {t} from 'plugin-api/beta/client/services';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 import cn from 'classnames';
 
-export default ({onBanUser}) => (
+const BanUserAction = ({onBanUser}) => (
   <button 
-    className={cn(styles.button, 'talk-plugin-moderation-actions-reject')}
+    className={cn(styles.button, 'talk-plugin-moderation-actions-ban')}
     onClick={onBanUser} >
     <Icon name="block" className={styles.icon} />
     {t('talk-plugin-moderation-actions.ban_user')}
   </button>
 );
+
+BanUserAction.propTypes = {
+  onBanUser: PropTypes.func,
+};
+
+export default BanUserAction;
diff --git a/plugins/talk-plugin-moderation-actions/client/components/BanUserDialog.js b/plugins/talk-plugin-moderation-actions/client/components/BanUserDialog.js
index 702ee4b10..c98e3e7c2 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/BanUserDialog.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/BanUserDialog.js
@@ -1,10 +1,12 @@
 import React from 'react';
+import PropTypes from 'prop-types';
+import cn from 'classnames';
 import styles from './BanUserDialog.css';
 import {t} from 'plugin-api/beta/client/services';
 import {Dialog, Button} from 'plugin-api/beta/client/components/ui';
 
-export default ({showBanDialog, closeBanDialog, banUser}) => (
-  <Dialog open={showBanDialog} className={styles.dialog}>
+const BanUserDialog = ({showBanDialog, closeBanDialog, banUser}) => (
+  <Dialog open={showBanDialog} className={cn(styles.dialog, 'talk-ban-user-dialog')}>
     <span className={styles.close} onClick={closeBanDialog}>×</span>
     <h2>{t('talk-plugin-moderation-actions.ban_user_dialog_headline')}</h2>
     <h3>{t('talk-plugin-moderation-actions.ban_user_dialog_sub')}</h3>
@@ -12,12 +14,28 @@ export default ({showBanDialog, closeBanDialog, banUser}) => (
       {t('talk-plugin-moderation-actions.ban_user_dialog_copy')}
     </p>
     <div className={styles.buttons}>
-      <Button cStyle="cancel" onClick={closeBanDialog} className={styles.cancel} raised>
+      <Button
+        cStyle="cancel"
+        onClick={closeBanDialog}
+        className={cn(styles.cancel, 'talk-ban-user-dialog-button-cancel')}
+        raised >
         {t('talk-plugin-moderation-actions.ban_user_dialog_cancel')}
       </Button>
-      <Button cStyle="black" onClick={banUser} className={styles.confirm} raised>
+      <Button
+        cStyle="black"
+        onClick={banUser}
+        className={cn(styles.confirm, 'talk-ban-user-dialog-button-confirm')}
+        raised >
         {t('talk-plugin-moderation-actions.ban_user_dialog_yes')}
       </Button>
     </div>
   </Dialog>
 );
+
+BanUserDialog.propTypes = {
+  showBanDialog: PropTypes.func.isRequired,
+  closeBanDialog: PropTypes.func.isRequired,
+  banUser: PropTypes.func.isRequired,
+};
+
+export default BanUserDialog;
\ No newline at end of file
diff --git a/plugins/talk-plugin-moderation-actions/client/components/Menu.js b/plugins/talk-plugin-moderation-actions/client/components/Menu.js
index 470349b69..29120423e 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/Menu.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/Menu.js
@@ -1,9 +1,10 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import styles from './Menu.css';
 import {t} from 'plugin-api/beta/client/services';
 
-export default ({className = '', children}) => (
+const Menu = ({className = '', children}) => (
   <div className={cn(styles.menu, className)}>
     <h3 className={styles.headline}>
       {t('talk-plugin-moderation-actions.moderation_actions')}
@@ -11,3 +12,10 @@ export default ({className = '', children}) => (
     {children}
   </div>
 );
+
+Menu.propTypes = {
+  className: PropTypes.string,
+  children: PropTypes.node,
+};
+
+export default Menu;
diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
index fa12500de..e27626298 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import Menu from './Menu';
 import styles from './ModerationActions.css';
@@ -21,7 +22,7 @@ export default class ModerationActions extends React.Component {
               <Icon name="keyboard_arrow_down" className={styles.icon} />}
           </span>
           {menuVisible && (
-            <Menu>
+            <Menu className="talk-plugin-modetarion-actions-menu">
               <Slot
                 className="talk-plugin-modetarion-actions-slot"
                 fill="moderationActions"
@@ -38,3 +39,13 @@ export default class ModerationActions extends React.Component {
     );
   }
 }
+
+ModerationActions.propTypes = {
+  comment: PropTypes.object,
+  root: PropTypes.object,
+  asset: PropTypes.object,
+  data: PropTypes.object,
+  menuVisible: PropTypes.bool,
+  toogleMenu: PropTypes.func,
+  hideMenu: PropTypes.func,
+};
diff --git a/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.js b/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.js
index 827820a7a..48a31c864 100644
--- a/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.js
+++ b/plugins/talk-plugin-moderation-actions/client/components/RejectCommentAction.js
@@ -1,12 +1,19 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import styles from './styles.css';
 import {t} from 'plugin-api/beta/client/services';
 import {Icon} from 'plugin-api/beta/client/components/ui';
 
-export default ({rejectComment}) => (
+const RejectCommentAction = ({rejectComment}) => (
   <button className={cn(styles.button, 'talk-plugin-moderation-actions-reject')} onClick={rejectComment}>
     <Icon name="clear" className={styles.icon} />
     {t('talk-plugin-moderation-actions.reject_comment')}
   </button>
 );
+
+RejectCommentAction.propTypes = {
+  rejectComment: PropTypes.func,
+};
+
+export default RejectCommentAction;
diff --git a/scripts/e2e-browserstack.js b/scripts/e2e-browserstack.js
deleted file mode 100755
index 103cd08fe..000000000
--- a/scripts/e2e-browserstack.js
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-const Nightwatch = require('nightwatch');
-const browserstack = require('browserstack-local');
-const {onshutdown} = require('../bin/util');
-
-async function start() {
-  try {
-    const bs_local = new browserstack.Local();
-    process.mainModule.filename = './node_modules/.bin/nightwatch';
-
-    // Code to start browserstack local before start of test
-    console.log('Connecting local');
-    Nightwatch.bs_local = bs_local;
-
-    bs_local.start({
-      'key': process.env.BROWSERSTACK_KEY,
-      'logFile': './test/e2e/bslocal.log'
-    }, function(error) {
-      if (error) {
-        console.error(error);
-        throw error;
-      }
-
-      console.log('Connected. Now testing...');
-      Nightwatch.cli(function(argv) {
-        Nightwatch.CliRunner(argv)
-          .setup(null, function(){
-
-            // Code to stop browserstack local after end of parallel test
-            bs_local.stop(function(){});
-          })
-          .runTests(function(){
-
-            // Code to stop browserstack local after end of single test
-            bs_local.stop(function(){});
-          });
-      });
-    });
-
-    onshutdown([
-      () => bs_local.stop(function(){}),
-    ]);
-  } catch (ex) {
-    console.log('There was an error while starting the test runner:\n\n');
-    process.stderr.write(`${ex.stack}\n`);
-    process.exit(2);
-  }
-}
-
-start();
diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh
index e72d1a6ce..3e9726340 100755
--- a/scripts/e2e-ci.sh
+++ b/scripts/e2e-ci.sh
@@ -1,92 +1,20 @@
 #!/bin/bash
 
-CIRCLE_TEST_REPORTS=${CIRCLE_TEST_REPORTS:-./test/e2e/reports}
+REPORTS_FOLDER=${CIRCLE_TEST_REPORTS:-./test/e2e/reports}
 CIRCLE_BRANCH=${CIRCLE_BRANCH:-master}
 
 # Amount of retries before failure.
 E2E_MAX_RETRIES=${E2E_MAX_RETRIES:-1}
 
-# Amount of seconds between tests.
-E2E_SLEEP_BETWEEN_TESTS=${E2E_SLEEP_BETWEEN_TESTS:-1}
-
 # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old.
-BROWSERS="chrome firefox ie edge" #safari
+# IE 64bit has issues with receiving keyboard input. Let's wait for them to fix it.
+BROWSERS="chrome,firefox,edge" #ie safari
 
-if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-
-  # List of failed browsers.
-  failedBrowsers=
-
-  # List of succeeded browsers.
-  succeededBrowsers=
-
-  exitCode=0
-
-  browserstack() {
-
-    # Current number of tries.
-    try=${2:-0}
-
-    echo "-- Start e2e for $1 #$try --"
-
-    REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/$1" yarn e2e-browserstack --env "$1"
-
-    # Determine exit code.
-    result=$?
-    if [ "$result" -ne "0" ]; then
-      echo "-- Failed e2e for $1 #$try --"
-
-      # Try again until E2E_MAX_RETRIES is reached.
-      if [ "$try" -lt "$E2E_MAX_RETRIES" ]; then
-        let try=try+1
-
-        # Sleep a bit to let browserstack-local close properly.
-        sleep "$E2E_SLEEP_BETWEEN_TESTS"
-
-        browserstack "$1" "$try"
-        return
-      fi
-
-      # Failed, add to list of failed browsers.
-      failedBrowsers="$failedBrowsers $1"
-
-      # Remember exit code.
-      exitCode=$result
-    else
-      echo "-- Success e2e for $1 #$try --"
-
-      # Succeeded, add to list of succeeded browsers.
-      succeededBrowsers="$succeededBrowsers $1"
-      eval "browser_${1}_succeeded_at=$try"
-    fi
-
-    # Sleep a bit to let browserstack-local close properly.
-    sleep "$E2E_SLEEP_BETWEEN_TESTS"
-  }
-
-  # Test using browserstack.
-  for browser in $BROWSERS
-  do
-    browserstack "$browser"
-  done
-
-
-  # Print information about succeeded browsers.
-  for x in $succeededBrowsers
-  do
-    echo "Succeeded $x at try #$(eval "echo \$browser_${x}_succeeded_at")"
-  done
-
-  # Print information about failed browsers.
-  for x in $failedBrowsers
-  do
-    echo "Failed $x"
-  done
-  exit $exitCode
+if [[ "${CIRCLE_BRANCH}" == "master" && -n "$BROWSERSTACK_KEY" ]]; then
+  echo Testing on browserstack
+  yarn e2e --reports-folder "$REPORTS_FOLDER" --bs-key "$BROWSERSTACK_KEY" --retries "$E2E_MAX_RETRIES" --browsers $BROWSERS
 else
   # When browserstack is not available test locally using chrome headless.
-  REPORTS_FOLDER="$CIRCLE_TEST_REPORTS/chrome" yarn e2e -- --env chrome-headless
-
-  # Will exit with status of last command.
-  exit $?
+  echo Testing locally
+  yarn e2e --reports-folder "$REPORTS_FOLDER" --retries "$E2E_MAX_RETRIES" --headless
 fi
diff --git a/scripts/e2e.js b/scripts/e2e.js
new file mode 100755
index 000000000..97e321310
--- /dev/null
+++ b/scripts/e2e.js
@@ -0,0 +1,207 @@
+#!/usr/bin/env node
+
+process.env['NODE_ENV'] = 'test';
+
+const browserstack = require('browserstack-local');
+const {onshutdown, shutdown} = require('../bin/util');
+const program = require('commander');
+const Table = require('cli-table');
+const serve = require('../serve');
+const childProcess = require('child_process');
+const uuid = require('uuid').v4;
+const mongoose = require('../services/mongoose');
+
+// Make things colorful!
+require('colors');
+
+function startTunnel(key, localIdentifier) {
+  const bs_local = new browserstack.Local();
+
+  // Code to start browserstack local before start of test
+  console.log('Connecting local');
+
+  return new Promise((resolve, reject) => {
+    bs_local.start({
+      key,
+      logFile: './test/e2e/bslocal.log',
+      verbose: 'true',
+      force: 'true',
+      onlyAutomate: 'true',
+      localIdentifier,
+    }, (error) => {
+      if (error) {
+        reject(error);
+      }
+      resolve();
+    });
+    onshutdown([
+      () => bs_local.stop(function(){}),
+    ]);
+  });
+}
+
+function seleniumInstall() {
+  return new Promise((resolve, reject) => {
+    try {
+      const nw = childProcess.spawn(
+        './node_modules/.bin/selenium-standalone',
+        ['install'],
+        {
+          stdio: 'inherit',
+        });
+      nw.on('close', (code) => {
+        code === 0 ? resolve() : reject();
+      });
+    }
+    catch (ex) {
+      reject(ex);
+    }
+  });
+}
+
+function nightwatch(env, config, reportsFolder, browserstack) {
+  return new Promise((resolve, reject) => {
+    try {
+      const nw = childProcess.spawn(
+        './node_modules/.bin/nightwatch',
+        ['--config', config, '--env', env],
+        {
+          env: Object.assign({}, process.env, {
+            'BROWSERSTACK_LOCAL_IDENTIFIER': browserstack.localIdentifier,
+            'BROWSERSTACK_KEY': browserstack.key,
+            'BROWSERSTACK_USER': browserstack.user,
+            'REPORTS_FOLDER': `${reportsFolder}/${env}`,
+          }),
+          stdio: 'inherit',
+        });
+      nw.on('close', (code) => {
+        code === 0 ? resolve() : reject();
+      });
+    }
+    catch (ex) {
+      reject(ex);
+    }
+  });
+}
+
+function printResults(browsers, succeeded, retries) {
+  let table = new Table({
+    head: [
+      'Browser'.cyan,
+      'Status'.cyan,
+      'Retries'.cyan,
+    ]
+  });
+
+  for (let browser of browsers) {
+    const wasSuccessful = browser in succeeded;
+    table.push([
+      browser,
+      wasSuccessful ? 'success'.green : 'failed'.red,
+      wasSuccessful ? succeeded[browser] : retries,
+    ]);
+  }
+
+  console.log(table.toString());
+}
+
+function printSection(txt) {
+  console.log('*****************************'.magenta);
+  console.log(`${'*'.magenta} ${txt.cyan}`);
+  console.log('*****************************'.magenta);
+}
+
+async function runBrowserTests(browsers, config, retries = 1, reportsFolder, browserstack) {
+  const succeeded = {};
+  for (let browser of browsers) {
+    for (let t = 0; t < retries + 1; t++) {
+      try {
+        printSection(`e2e test for ${browser} #${t}`);
+        await nightwatch(browser, config, reportsFolder, browserstack);
+        succeeded[browser] = t;
+        console.log(`\n==> Succeeded e2e for ${browser} #${t}\n`.green);
+        break;
+      }
+      catch (ex) {
+        if (ex) {
+          console.log('There was an error while starting the test runner:\n\n');
+          process.stderr.write(`${ex.stack}\n`);
+        }
+        console.log(`\n==> Failed e2e for ${browser} #${t}\n`.red);
+      }
+    }
+  }
+  printResults(browsers, succeeded, retries);
+  return Object.keys(succeeded).length === browsers.length;
+}
+
+async function start(program) {
+  const localIdentifier = uuid();
+  let browsers = program.browsers.split(',');
+  const retries = Number.parseInt(program.retries);
+  const browserstack = {};
+  const date = new Date().toISOString()
+    .replace(/[T.]/g, '-')
+    .replace(/:/g, '');
+  const reportsFolder = `${program.reportsFolder}/${date}`;
+  let exitCode = 0;
+  let config = 'nightwatch.conf.js';
+  try {
+    if (program.tunnel && program.bsKey) {
+      await startTunnel(program.bsKey, localIdentifier);
+    }
+
+    console.log('Dropping test database');
+    await mongoose.connection.dropDatabase();
+    await serve();
+
+    if (program.bsKey) {
+      config = 'nightwatch-browserstack.conf.js';
+      browserstack.localIdentifier = localIdentifier;
+      browserstack.key = program.bsKey;
+      browserstack.user = program.bsUser;
+    } else {
+
+      // Install selenium standalone.
+      await seleniumInstall();
+      if (program.headless) {
+        browsers = browsers.map((b) => `${b}-headless`);
+      }
+    }
+
+    const succeeded = await runBrowserTests(
+      browsers,
+      config,
+      retries,
+      reportsFolder,
+      browserstack,
+    );
+    if (!succeeded) {
+      exitCode = 1;
+    }
+  }
+  catch (ex) {
+    console.log('There was an error:\n\n');
+    process.stderr.write(`${ex.stack}\n`);
+    process.exit(2);
+  }
+  finally {
+    console.log('Shutting down');
+    shutdown();
+  }
+  process.exit(exitCode);
+}
+
+program
+  .version('0.1.0')
+  .description('Perform e2e testing locally or if browserstack credentials are provided on browserstack.')
+  .option('-u, --bs-user [user]', 'Browserstack user', 'coralproject2')
+  .option('-k, --bs-key [key]', 'Browserstack api key')
+  .option('--no-tunnel', 'Dont start browserstack-local')
+  .option('-b, --browsers [list of browsers]', 'Browsers to test', 'chrome')
+  .option('-r, --retries [number]', 'Number of retries before failing', '1')
+  .option('--headless', 'Start in headless mode for local e2e')
+  .option('--reports-folder [folder]', 'Reports folder', './test/e2e/reports')
+  .parse(process.argv);
+
+start(program);
diff --git a/test/e2e/globals.js b/test/e2e/globals.js
index a828804b4..4d2740404 100644
--- a/test/e2e/globals.js
+++ b/test/e2e/globals.js
@@ -1,11 +1,10 @@
-const serve = require('../../serve');
 const mongoose = require('../../services/mongoose');
 const {shutdown} = require('../../bin/util');
 
 module.exports = {
   before: async (done) => {
+    console.log('Dropping test database');
     await mongoose.connection.dropDatabase();
-    await serve();
     done();
   },
   after: (done) => {
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 92f2ac0e1..aa3b58ab5 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -7,21 +7,165 @@ module.exports = {
       return this
         .waitForElementVisible('body');
     },
+    openDrawer() {
+      this
+        .waitForElementVisible('@drawerButton')
+        .click('@drawerButton');
+      this.expect.section('@drawer').to.be.visible;
+      return this.section.drawer;
+    },
+    goToModerate() {
+      this
+        .click('@moderateNav')
+        .expect.section('@moderate').to.be.visible;
+      return this.section.moderate;
+    },
+    goToStories() {
+      this
+        .click('@storiesNav')
+        .expect.section('@stories').to.be.visible;
+      return this.section.stories;
+    },
+    goToCommunity() {
+      this
+        .click('@communityNav')
+        .expect.section('@community').to.be.visible;
+      return this.section.community;
+    },
+    logout() {
+      this
+        .waitForElementVisible('@settingsButton')
+        .click('@settingsButton')
+        .waitForElementVisible('@signOutButton')
+        .click('@signOutButton');
+    },
+    navigateAndLogin(user) {
+      this
+        .navigate()
+        .expect.section('@login').to.be.visible;
+      return this.section.login.login(user);
+    },
   }],
   elements: {
-    'loginLayout': '.talk-admin-login',
-    'signInForm': '.talk-admin-login-sign-in',
-    'emailInput': '.talk-admin-login-sign-in #email',
-    'passwordInput': '.talk-admin-login-sign-in #password',
-    'signInButton': '.talk-admin-login-sign-in-button',
-    'storiesNav': '.talk-admin-nav-stories',
-    'storiesDrawerNav': '.talk-admin-drawer-nav .talk-admin-nav-stories',
-    'storiesSection': '.talk-admin-stories',
-    'communityNav': '.talk-admin-nav-community',
-    'communityDrawerNav': '.talk-admin-drawer-nav .talk-admin-nav-community',
-    'communitySection': '.talk-admin-community',
-    'moderationContainer': '.talk-admin-moderation-container',
-    'drawerButton': '.mdl-layout__drawer-button',
-    'drawerOverlay': 'div.mdl-layout__obfuscator.is-visible',
-  }
+    drawerButton: '.mdl-layout__drawer-button',
+    drawerOverlay: 'div.mdl-layout__obfuscator.is-visible',
+    storiesNav: '.talk-admin-nav-stories',
+    communityNav: '.talk-admin-nav-community',
+    moderateNav: '.talk-admin-nav-moderate',
+    settingsButton: '.talk-admin-header-settings-button',
+    signOutButton: '.talk-admin-header-sign-out',
+    suspendUserDialog: '.talk-admin-suspend-user-dialog',
+    suspendUserConfirmButton: '.talk-admin-suspend-user-dialog-confirm',
+    supendUserSendButton: '.talk-admin-suspend-user-dialog-send',
+    toast: '.toastify',
+    toastClose: '.toastify__close',
+  },
+  sections: {
+    moderate: {
+      selector: '.talk-admin-moderation-container',
+      elements: {
+        comment: '.talk-admin-moderate-comment',
+        commentActionMenu: '.talk-admin-moderate-comment-actions-menu',
+        actionItemSuspendUser: '.action-menu-item#suspendUser',
+        actionMenuButton: '.talk-admin-moderate-comment-actions-menu #actions-dropdown-0'
+      }
+    },
+    stories: {
+      selector: '.talk-admin-stories',
+    },
+    community: {
+      selector: '.talk-admin-community',
+      commands: [{
+        url: function() {
+          return `${this.api.launchUrl}/admin/community`;
+        },
+        ready() {
+          return this
+            .waitForElementVisible('body');
+        },
+        goToPeople() {
+          this
+            .click('@peopleNav')
+            .expect.section('@people').to.be.visible;
+          return this.section.people;
+        },
+      }],
+      elements: {
+        peopleNav: '.talk-admin-nav-people',
+        flaggedAccountsNav: '.talk-admin-nav-flagged-accounts',
+        flaggedAccountsContainer: '.talk-adnin-community-flagged-accounts',
+        flaggedUser:'.talk-admin-community-flagged-user',
+        flaggedUserApproveButton: '.talk-admin-flagged-user-approve-button',
+        flaggedUserRejectButton: '.talk-admin-flagged-user-reject-button',
+        usernameDialog: '.talk-reject-username-dialog',
+        usernameDialogButtons: '.talk-reject-username-dialog-buttons',
+        usernameDialogSuspend: '.talk-reject-username-dialog-button-k',
+        usernameDialogSuspensionMessage: '.talk-reject-username-dialog-suspension-message'
+      },
+      sections: {
+        people: {
+          selector: '.talk-admin-community-people-container',
+          elements: {
+            firstRow: '.talk-admin-community-people-row:first-child',
+            dropdownStatus: '.talk-admin-community-people-dd-status',
+            dropdownRole: '.talk-admin-community-people-dd-role',
+            dropdownStatusActive: '.talk-admin-community-people-dd-status .dd-list-active',
+            optionActive: '.dd-option#ACTIVE',
+            optionBanned: '.dd-option#BANNED',
+          }
+        }
+      }
+    },
+    drawer: {
+      selector: '.talk-admin-drawer-nav',
+      commands: [{
+        goToStories() {
+          this
+            .click('@storiesButton');
+          this.parent.expect.section('@stories').to.be.visible;
+          this.close();
+          return this.parent.section.stories;
+        },
+        goToCommunity() {
+          this
+            .click('@communityButton');
+          this.parent.expect.section('@community').to.be.visible;
+          this.close();
+          return this.parent.section.stories;
+        },
+        close() {
+          this.parent
+            .click('@drawerOverlay')
+            .waitForElementNotPresent('@drawerOverlay');
+          return this.parent;
+        },
+      }],
+      elements: {
+        'storiesButton': '.talk-admin-drawer-nav .talk-admin-nav-stories',
+        'communityButton': '.talk-admin-drawer-nav .talk-admin-nav-community',
+      },
+    },
+    login: {
+      commands: [{
+        login(user) {
+          this
+            .waitForElementVisible('@signInForm')
+            .setValue('@emailInput', user.email)
+            .setValue('@passwordInput', user.password)
+            .waitForElementVisible('@signInButton')
+            .click('@signInButton');
+          const adminPage = this.api.page.admin();
+          adminPage.expect.section('@moderate').to.be.visible;
+          return adminPage.section.moderate;
+        },
+      }],
+      selector: '.talk-admin-login',
+      elements: {
+        'signInForm': '.talk-admin-login-sign-in',
+        'emailInput': '.talk-admin-login-sign-in #email',
+        'passwordInput': '.talk-admin-login-sign-in #password',
+        'signInButton': '.talk-admin-login-sign-in-button',
+      }
+    },
+  },
 };
diff --git a/test/e2e/page_objects/embedStream.js b/test/e2e/page_objects/embedStream.js
index f148ae7bc..1cecad2a3 100644
--- a/test/e2e/page_objects/embedStream.js
+++ b/test/e2e/page_objects/embedStream.js
@@ -1,21 +1,38 @@
 const iframeId = 'coralStreamEmbed_iframe';
+const SortedWindowHandler = require('../utils/SortedWindowHandler');
 
 module.exports = {
   commands: [{
+    ready: function() {
+      this.switchToIframe();
+      this.expect.section('@comments').to.be.visible;
+      return this.section.comments;
+    },
+    goToProfileSection: function() {
+      this.waitForElementVisible('@profileTabButton');
+      this.click('@profileTabButton');
+      this.expect.section('@profile').to.be.visible;
+      return this.section.profile;
+    },
+    goToCommentsSection: function() {
+      this.waitForElementVisible('@commentsTabButton');
+      this.click('@commentsTabButton');
+      this.expect.section('@comments').to.be.visible;
+      return this.section.comments;
+    },
     navigateToAsset: function(asset) {
       this.api.url(`${this.api.launchUrl}/assets/title/${asset}`);
       return this;
     },
-    getEmbedSection: function() {
+    switchToIframe: function() {
       this.waitForElementVisible('@iframe');
 
       // Pause a bit to let iframe initialize in the hope that it'll
       // fix https://www.browserstack.com/automate/builds/96419cf46e3d6376a36ae6d3f90934112df1ed91/sessions/224f1a1566c1c8c7859e2e76ece51862200f0173#automate_button
-      this.api.pause(200);
+      this.api.pause(1000);
 
       this.api.frame(iframeId);
-      this.expect.section('@embed').to.be.present;
-      return this.section.embed;
+      return this;
     },
   }],
   url: function() {
@@ -23,49 +40,107 @@ module.exports = {
   },
   elements: {
     iframe: `#${iframeId}`,
+    commentsTabButton: '.talk-embed-stream-comments-tab > button',
+    profileTabButton: '.talk-embed-stream-profile-tab > button',
+    banDialog: '.talk-ban-user-dialog',
+    banDialogConfirmButton: '.talk-ban-user-dialog-button-confirm',
   },
   sections: {
-    embed: {
+    comments: {
       commands: [{
-        getProfileSection: function() {
-          this.waitForElementVisible('@profileTabButton');
-          this.click('@profileTabButton');
-          this.expect.section('@profile').to.be.present;
-          return this.section.profile;
+        openLoginPopup(callback) {
+          const windowHandler = new SortedWindowHandler(this.api);
+
+          this
+            .waitForElementVisible('@signInButton')
+            .click('@signInButton');
+
+          // Wait for window to be created
+          // https://www.browserstack.com/automate/builds/1ceccf4efb4683b7feb890f45a32b5922b40ed3f/sessions/17b1a79682bef2498cb0be86eac317a08c976b0a#automate_button
+          this.api.pause(200);
+
+          // Focusing on the Login PopUp
+          windowHandler.windowHandles((handles) => {
+            this.api.switchWindow(handles[1]);
+          });
+
+          const popup = this.api.page.popup().ready();
+          callback(popup);
+
+          // Give a tiny bit of time to let popup close.
+          this.api.pause(50);
+
+          if (this.api.capabilities.browserName === 'MicrosoftEdge') {
+
+            // More time for edge.
+            // https://www.browserstack.com/automate/builds/1ceccf4efb4683b7feb890f45a32b5922b40ed3f/sessions/7393dbfda8387e43b6d5851f359b0c07db414973
+            this.api.pause(1000);
+          }
+
+          // Focusing on the Embed Window
+          windowHandler.windowHandles((handles) => {
+            this.api.switchWindow(handles[0]);
+
+            // For some reasons firefox does not automatically load auth after login.
+            // https://www.browserstack.com/automate/builds/37650cb4e66c6edce0ba0800a1c1b7e7f74bf991/sessions/7a4e9da69b0f9ecdf8b7fa9150639e47b1532cb0#automate_button
+            if (this.api.capabilities.browserName === 'firefox') {
+              this.parent.navigate().ready();
+            } else {
+              this.parent.switchToIframe();
+            }
+          });
+          return this;
         },
-        getCommentsSection: function() {
-          this.waitForElementVisible('@commentsTabButton');
-          this.click('@commentsTabButton');
-          this.expect.section('@comments').to.be.present;
-          return this.section.comments;
+        logout() {
+          this
+            .waitForElementVisible('@logoutButton')
+            .click('@logoutButton');
         },
       }],
-      selector: '#talk-embed-stream-container',
+      selector: '.talk-embed-stream-comments-tab-pane',
       elements: {
         logoutButton: '.talk-stream-userbox-logout',
-        commentsTabButton: '.talk-embed-stream-comments-tab > button',
-        profileTabButton: '.talk-embed-stream-profile-tab > button',
         signInButton: '#coralSignInButton',
         commentBoxTextarea: '#commentText',
         commentBoxPostButton: '.talk-plugin-commentbox-button',
+        firstComment: '.talk-stream-comment.talk-stream-comment-level-0',
         firstCommentContent: '.talk-stream-comment.talk-stream-comment-level-0 .talk-stream-comment-content',
-        respectButton: '.talk-stream-comment.talk-stream-comment-level-0 .talk-stream-comment-footer .talk-plugin-respect-button'
+        flagButton: '.talk-stream-comment.talk-stream-comment-level-0 .talk-plugin-flags-button',
+        respectButton: '.talk-stream-comment.talk-stream-comment-level-0 .talk-stream-comment-footer .talk-plugin-respect-button',
+        restrictedMessageBox: '.talk-restricted-message-box',
+        suspendedAccountInput: '.talk-suspended-account-username-input',
+        suspendedAccountSubmitButton: '.talk-suspended-account-submit-button',
       },
       sections: {
-        profile: {
-          selector: '.talk-embed-stream-profile-tab-pane',
+        flag: {
+          selector: '.talk-plugin-flags-popup',
           elements: {
-            notLoggedIn: '.talk-embed-stream-not-logged-in',
-            myCommentHistory: '.talk-my-profile-comment-history',
-            myCommentHistoryReactions: '.talk-my-profile-comment-history .comment-summary .comment-summary-reactions',
-            myCommentHistoryReactionCount: '.talk-my-profile-comment-history .comment-summary .comment-summary-reactions .comment-summary-reaction-count',
-            myCommentHistoryComment: '.talk-my-profile-comment-history .my-comment-body'
+            offensiveUsernameRadio: '.talk-plugin-flags-popup-radio#USERNAME_OFFENSIVE',
+            flagUsernameRadio: '.talk-plugin-flags-popup-radio#USERS',
+            flagCommentRadio: '.talk-plugin-flags-popup-radio#COMMENTS',
+            continueButton: '.talk-plugin-flags-popup-button',
+            popUpText: '.talk-plugin-flags-popup-text',
+            spamCommentRadio: '.talk-plugin-flags-popup-radio#COMMENT_SPAM',
+          }
+        },
+        mod: {
+          selector: '.talk-plugin-moderation-actions',
+          elements: {
+            arrow: '.talk-plugin-moderation-actions-arrow',
+            menu: '.talk-plugin-modetarion-actions-menu',
+            banButton: '.talk-plugin-moderation-actions-ban',
           },
         },
-        comments: {
-          selector: '.talk-embed-stream-comments-tab-pane',
-          elements: {},
-        },
+      },
+    },
+    profile: {
+      selector: '.talk-embed-stream-profile-tab-pane',
+      elements: {
+        notLoggedIn: '.talk-embed-stream-not-logged-in',
+        myCommentHistory: '.talk-my-profile-comment-history',
+        myCommentHistoryReactions: '.talk-my-profile-comment-history .comment-summary .comment-summary-reactions',
+        myCommentHistoryReactionCount: '.talk-my-profile-comment-history .comment-summary .comment-summary-reactions .comment-summary-reaction-count',
+        myCommentHistoryComment: '.talk-my-profile-comment-history .my-comment-body',
       },
     },
   },
diff --git a/test/e2e/page_objects/login.js b/test/e2e/page_objects/login.js
deleted file mode 100644
index 1abc40aa8..000000000
--- a/test/e2e/page_objects/login.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = {
-  elements: {
-    registerButton: '#coralRegister',
-    signInButton: '#coralSignInButton',
-    emailInput: '#email',
-    usernameInput: '#username',
-    passwordInput: '#password',
-    confirmPasswordInput: '#confirmPassword',
-    signUpButton: '#coralSignUpButton',
-    signIn: '.coral-sign-in',
-    loginButton: '#coralLogInButton'
-  },
-};
diff --git a/test/e2e/page_objects/popup.js b/test/e2e/page_objects/popup.js
new file mode 100644
index 000000000..4d2aee7b6
--- /dev/null
+++ b/test/e2e/page_objects/popup.js
@@ -0,0 +1,41 @@
+module.exports = {
+  commands: [{
+    ready() {
+      return this
+        .waitForElementVisible('body');
+    },
+    login(user) {
+      return this
+        .setValue('@emailInput', user.email)
+        .setValue('@passwordInput', user.password)
+        .waitForElementVisible('@signIn')
+        .waitForElementVisible('@loginButton')
+        .click('@loginButton');
+    },
+    register(user) {
+      return this
+        .waitForElementVisible('@registerButton')
+        .click('@registerButton')
+        .setValue('@emailInput', user.email)
+        .setValue('@usernameInput', user.username)
+        .setValue('@passwordInput', user.password)
+        .setValue('@confirmPasswordInput', user.password)
+        .waitForElementVisible('@signUpButton')
+        .click('@signUpButton')
+        .waitForElementVisible('@signIn')
+        .waitForElementVisible('@loginButton')
+        .click('@loginButton');
+    },
+  }],
+  elements: {
+    registerButton: '#coralRegister',
+    signInButton: '#coralSignInButton',
+    emailInput: '#email',
+    usernameInput: '#username',
+    passwordInput: '#password',
+    confirmPasswordInput: '#confirmPassword',
+    signUpButton: '#coralSignUpButton',
+    signIn: '.coral-sign-in',
+    loginButton: '#coralLogInButton'
+  },
+};
diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js
index 25c902e0f..078a22e50 100644
--- a/test/e2e/specs/01_install.js
+++ b/test/e2e/specs/01_install.js
@@ -1,12 +1,27 @@
 module.exports = {
   '@tags': ['install'],
 
+   before: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+
   'User goes to install': (client) => {
     const install = client.page.install();
 
     install
       .navigate()
-      .expect.section('@step1').to.be.present;
+      .expect.section('@step1').to.be.visible;
 
   },
   'User clicks get started button': (client) => {
@@ -20,7 +35,7 @@ module.exports = {
     const install = client.page.install();
 
     install
-      .expect.section('@step2').to.be.present;
+      .expect.section('@step2').to.be.visible;
   },
   'User fills step 2': (client) => {
     const step2 = client.page.install().section.step2;
@@ -36,7 +51,7 @@ module.exports = {
     const install = client.page.install();
 
     install
-      .expect.section('@step3').to.be.present;
+      .expect.section('@step3').to.be.visible;
   },
   'User fills step 3': (client) => {
     const step3 = client.page.install().section.step3;
@@ -54,7 +69,7 @@ module.exports = {
     const install = client.page.install();
 
     install
-      .expect.section('@step4').to.be.present;
+      .expect.section('@step4').to.be.visible;
   },
   'User fills step 4': (client) => {
     const step4 = client.page.install().section.step4;
@@ -73,9 +88,6 @@ module.exports = {
     const install = client.page.install();
 
     install
-      .expect.section('@step5').to.be.present;
+      .expect.section('@step5').to.be.visible;
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/02_admin.js b/test/e2e/specs/02_admin.js
index 4744d2116..29957e487 100644
--- a/test/e2e/specs/02_admin.js
+++ b/test/e2e/specs/02_admin.js
@@ -1,55 +1,41 @@
 module.exports = {
   '@tags': ['admin', 'login'],
-   beforeEach: (client) => {
 
+   before: (client) => {
     client.resizeWindow(1024, 800);
   },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+
   'Admin logs in': (client) => {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
 
-    adminPage
-      .navigate()
-      .waitForElementVisible('@loginLayout')
-      .waitForElementVisible('@signInForm')
-      .setValue('@emailInput', admin.email)
-      .setValue('@passwordInput', admin.password)
-      .waitForElementVisible('@signInButton')
-      .click('@signInButton');
-
-    adminPage
-      .waitForElementVisible('@moderationContainer');
+    adminPage.navigateAndLogin(admin);
   },
 
   'Admin goes to Stories': (client) => {
     const adminPage = client.page.admin();
 
     adminPage
-      .navigate()
-      .waitForElementVisible('@drawerButton')
-      .click('@drawerButton')
-      .waitForElementVisible('@storiesDrawerNav')
-      .click('@storiesDrawerNav')
-      .waitForElementVisible('@drawerOverlay')
-      .click('@drawerOverlay')
-      .waitForElementVisible('@storiesSection');
-
+      .openDrawer()
+        .goToStories();
   },
 
   'Admin goes to Community': (client) => {
     const adminPage = client.page.admin();
 
     adminPage
-      .navigate()
-      .waitForElementVisible('@drawerButton')
-      .click('@drawerButton')
-      .waitForElementVisible('@communityDrawerNav')
-      .click('@communityDrawerNav')
-      .waitForElementVisible('@drawerOverlay')
-      .click('@drawerOverlay')
-      .waitForElementVisible('@communitySection');
+      .openDrawer()
+        .goToCommunity();
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/03_embedStream.js b/test/e2e/specs/03_embedStream.js
index 53da1e87d..567596dd2 100644
--- a/test/e2e/specs/03_embedStream.js
+++ b/test/e2e/specs/03_embedStream.js
@@ -1,7 +1,21 @@
-const SortedWindowHandler = require('../utils/SortedWindowHandler');
-
 module.exports = {
   '@tags': ['embedStream', 'login'],
+
+   before: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+
   'creates a new asset': (client) => {
     const asset = 'newAssetTest';
     const embedStream = client.page.embedStream();
@@ -9,92 +23,43 @@ module.exports = {
     embedStream
       .navigateToAsset(asset)
       .assert.title(asset)
-      .getEmbedSection();
+      .ready();
   },
 
   'creates an user and user logs in': (client) => {
     const {testData: {user}} = client.globals;
     const embedStream = client.page.embedStream();
 
-    const embed = embedStream
+    // Go back to default asset.
+    const comments =
+      embedStream
       .navigate()
-      .getEmbedSection();
+      .ready();
 
-    const windowHandler = new SortedWindowHandler(client);
-
-    embed
-      .waitForElementVisible('@signInButton')
-      .click('@signInButton');
-
-    // Wait for window to be created
-    // https://www.browserstack.com/automate/builds/1ceccf4efb4683b7feb890f45a32b5922b40ed3f/sessions/17b1a79682bef2498cb0be86eac317a08c976b0a#automate_button
-    client.pause(200);
-
-    // Focusing on the Login PopUp
-    windowHandler.windowHandles((handles) => {
-      client.switchWindow(handles[1]);
-    });
-
-    const login = client.page.login();
-
-    login
-      .waitForElementVisible('@registerButton')
-      .click('@registerButton')
-      .setValue('@emailInput', user.email)
-      .setValue('@usernameInput', user.username)
-      .setValue('@passwordInput', user.password)
-      .setValue('@confirmPasswordInput', user.password)
-      .waitForElementVisible('@signUpButton')
-      .click('@signUpButton')
-      .waitForElementVisible('@signIn')
-      .waitForElementVisible('@loginButton')
-      .click('@loginButton');
-
-    // Give a tiny bit of time to let popup close.
-    client.pause(50);
-
-    if (client.capabilities.browserName === 'MicrosoftEdge') {
-
-      // More time for edge.
-      // https://www.browserstack.com/automate/builds/1ceccf4efb4683b7feb890f45a32b5922b40ed3f/sessions/7393dbfda8387e43b6d5851f359b0c07db414973
-      client.pause(1000);
-    }
-
-    // Focusing on the Embed Window
-    windowHandler.windowHandles((handles) => {
-      client.switchWindow(handles[0]);
-    });
+    comments
+      .openLoginPopup((popup) => {
+        popup.register(user);
+      });
   },
   'user posts a comment': (client) => {
-    const embedStream = client.page.embedStream();
+    const comments = client.page.embedStream().section.comments;
     const {testData: {comment}} = client.globals;
 
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    embed
+    comments
       .waitForElementVisible('@commentBoxTextarea')
       .setValue('@commentBoxTextarea', comment.body)
       .waitForElementVisible('@commentBoxPostButton')
       .click('@commentBoxPostButton')
       .waitForElementVisible('@firstCommentContent')
       .getText('@firstCommentContent', (result) => {
-        embed.assert.equal(result.value, comment.body);
+        comments.assert.equal(result.value, comment.body);
       });
   },
 
   'signed in user sees comment history': (client) => {
-    const embedStream = client.page.embedStream();
+    const profile = client.page.embedStream().goToProfileSection();
     const {testData: {comment}} = client.globals;
 
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    const profile = embed
-      .getProfileSection();
-
     profile
       .waitForElementVisible('@myCommentHistory')
       .waitForElementVisible('@myCommentHistoryComment')
@@ -103,14 +68,7 @@ module.exports = {
       });
   },
   'user sees replies and reactions to comments': (client) => {
-    const embedStream = client.page.embedStream();
-
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    const profile = embed
-      .getProfileSection();
+    const profile = client.page.embedStream().section.profile;
 
     profile
       .waitForElementVisible('@myCommentHistory')
@@ -122,17 +80,12 @@ module.exports = {
   },
   'user goes to the stream and replies and reacts to comment': (client) => {
     const embedStream = client.page.embedStream();
-
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    embed
+    const comments = embedStream.goToCommentsSection();
+    comments
       .waitForElementVisible('@respectButton')
       .click('@respectButton');
 
-    const profile = embed
-      .getProfileSection();
+    const profile = embedStream.goToProfileSection();
 
     profile
       .waitForElementVisible('@myCommentHistory')
@@ -144,31 +97,16 @@ module.exports = {
   },
   'user logs out': (client) => {
     const embedStream = client.page.embedStream();
+    const comments = embedStream.goToCommentsSection();
 
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    embed
-      .waitForElementVisible('@commentsTabButton')
-      .click('@commentsTabButton')
-      .waitForElementVisible('@logoutButton')
-      .click('@logoutButton');
+    comments
+      .logout();
   },
   'not logged in user clicks my profile tab': (client) => {
     const embedStream = client.page.embedStream();
-
-    const embed = embedStream
-      .navigate()
-      .getEmbedSection();
-
-    const profile = embed
-      .getProfileSection();
+    const profile = embedStream.goToProfileSection();
 
     profile
       .assert.visible('@notLoggedIn');
   },
-  after: (client) => {
-    client.end();
-  }
 };
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
new file mode 100644
index 000000000..5a7593e53
--- /dev/null
+++ b/test/e2e/specs/04_userStatus.js
@@ -0,0 +1,117 @@
+module.exports = {
+
+   before: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+
+  'admin logs in': (client) => {
+    const adminPage = client.page.admin();
+    const {testData: {admin}} = client.globals;
+
+    adminPage.navigateAndLogin(admin);
+  },
+  'admin flags user\'s username as offensive': (client) => {
+    const embedStream = client.page.embedStream();
+
+    const comments = embedStream
+      .navigate()
+      .ready();
+
+    comments
+      .waitForElementVisible('@firstComment')
+      .waitForElementVisible('@flagButton')
+      .click('@flagButton');
+
+    comments.section.flag
+      .waitForElementVisible('@flagUsernameRadio')
+      .click('@flagUsernameRadio')
+      .waitForElementVisible('@continueButton')
+      .click('@continueButton')
+      .waitForElementVisible('@offensiveUsernameRadio')
+      .click('@offensiveUsernameRadio')
+      .click('@continueButton')
+      .waitForElementVisible('@popUpText')
+      .click('@continueButton');
+  },
+  'admin goes to Reported Usernames': (client) => {
+    const adminPage = client.page.admin();
+
+    const community = adminPage
+      .navigate()
+      .ready()
+      .goToCommunity();
+
+    community
+      .waitForElementVisible('@flaggedAccountsContainer')
+      .waitForElementVisible('@flaggedUser');
+  },
+  'admin rejects the user flag': (client) => {
+    const community = client.page.admin().section.community;
+
+    community
+      .waitForElementVisible('@flaggedUserRejectButton')
+      .click('@flaggedUserRejectButton');
+  },
+  'admin suspends the user': (client) => {
+    const community = client.page.admin().section.community;
+
+    community
+      .waitForElementVisible('@usernameDialog')
+      .waitForElementVisible('@usernameDialogButtons')
+      .waitForElementVisible('@usernameDialogSuspend')
+      .click('@usernameDialogSuspend')
+      .waitForElementVisible('@usernameDialogSuspensionMessage')
+      .click('@usernameDialogSuspend')
+      .waitForElementNotPresent('@flaggedUser');
+  },
+  'admin logs out': (client) => {
+    client.page.admin().logout();
+  },
+  'user logs in': (client) => {
+    const {testData: {user}} = client.globals;
+    const embedStream = client.page.embedStream();
+
+    embedStream
+      .navigate()
+      .ready()
+      .openLoginPopup((popup) => popup.login(user));
+  },
+  'user account is suspended, should see restricted message box': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementVisible('@restrictedMessageBox');
+  },
+  'user picks another username': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+    const {testData: {user}} = client.globals;
+
+    comments
+      .waitForElementVisible('@suspendedAccountInput')
+      .setValue('@suspendedAccountInput', `${user.username}_alternative`)
+      .waitForElementVisible('@suspendedAccountSubmitButton')
+      .click('@suspendedAccountSubmitButton')
+      .waitForElementNotPresent('@suspendedAccountInput');
+  },
+  'user should not be able to comment': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementNotPresent('@commentBoxTextarea')
+      .waitForElementNotPresent('@commentBoxPostButton');
+  },
+};
diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js
new file mode 100644
index 000000000..da0d11e7a
--- /dev/null
+++ b/test/e2e/specs/05_banUser.js
@@ -0,0 +1,125 @@
+module.exports = {
+
+   before: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+
+  'admin logs in': (client) => {
+    const adminPage = client.page.admin();
+    const {testData: {admin}} = client.globals;
+
+    adminPage.navigateAndLogin(admin);
+  },
+  'navigate to the embed stream': (client) => {
+    const embedStream = client.page.embedStream();
+
+    embedStream
+      .navigate()
+      .ready();
+  },
+  'admin bans user': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments.section.mod
+      .waitForElementVisible('@arrow')
+      .click('@arrow')
+      .waitForElementVisible('@menu')
+      .waitForElementVisible('@banButton')
+      .click('@banButton');
+
+    embedStream
+      .waitForElementVisible('@banDialog')
+      .waitForElementVisible('@banDialogConfirmButton')
+      .click('@banDialogConfirmButton')
+      .waitForElementNotVisible('@banDialog');
+  },
+  'admin logs out': (client) => {
+    const comments = client.page.embedStream().section.comments;
+
+    comments
+      .logout();
+  },
+  'user logs in': (client) => {
+    const {testData: {user}} = client.globals;
+    const comments = client.page.embedStream().section.comments;
+
+    comments
+      .openLoginPopup((popup) => popup.login(user));
+  },
+  'user account is banned, should see restricted message box': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementVisible('@restrictedMessageBox');
+  },
+  'user logs out': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .logout();
+  },
+  'admin logs in (2)': (client) => {
+    const adminPage = client.page.admin();
+    const {testData: {admin}} = client.globals;
+
+    adminPage.navigateAndLogin(admin);
+  },
+  'admin goes to community': (client) => {
+    const adminPage = client.page.admin();
+
+    adminPage
+      .goToCommunity()
+        .goToPeople();
+  },
+  'admin removes ban from user': (client) => {
+    const people = client.page.admin()
+      .section.community
+      .section.people;
+
+    people
+      .waitForElementVisible('@firstRow')
+      .waitForElementVisible('@dropdownStatus')
+      .click('@dropdownStatus')
+      .waitForElementVisible('@dropdownStatusActive')
+      .click('@optionActive');
+  },
+  'admin logs out 2': (client) => {
+    client.page.admin().logout();
+  },
+  'navigate to the embed stream 2': (client) => {
+    const embedStream = client.page.embedStream();
+
+    embedStream
+      .navigate()
+      .ready();
+  },
+  'user logs in 2': (client) => {
+    const {testData: {user}} = client.globals;
+    const comments = client.page.embedStream().section.comments;
+
+    comments
+      .openLoginPopup((popup) => popup.login(user));
+  },
+  'user should be able to comment': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementVisible('@commentBoxTextarea')
+      .waitForElementVisible('@commentBoxPostButton');
+  },
+};
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
new file mode 100644
index 000000000..20f38c2c2
--- /dev/null
+++ b/test/e2e/specs/06_suspendUser.js
@@ -0,0 +1,138 @@
+module.exports = {
+
+  before: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
+
+  afterEach: (client, done) => {
+    if (client.currentTest.results.failed) {
+      throw new Error('Test Case failed, skipping all the rest');
+    }
+    done();
+  },
+
+  after: (client) => {
+    client.end();
+  },
+  'user logs in': (client) => {
+    const {testData: {user}} = client.globals;
+    const embedStream = client.page.embedStream();
+    const comments = client.page.embedStream().section.comments;
+
+    embedStream
+      .navigate()
+      .ready();
+
+    comments
+      .openLoginPopup((popup) => popup.login(user));
+  },
+  'user posts comment': (client) => {
+    const comments = client.page.embedStream().section.comments;
+    const {testData: {comment}} = client.globals;
+
+    comments
+      .waitForElementVisible('@commentBoxTextarea')
+      .setValue('@commentBoxTextarea', comment.body)
+      .waitForElementVisible('@commentBoxPostButton')
+      .click('@commentBoxPostButton')
+      .waitForElementVisible('@firstCommentContent')
+      .getText('@firstCommentContent', (result) => {
+        comments.assert.equal(result.value, comment.body);
+      });
+  },
+  'user logs out': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .logout();
+  },
+  'admin logs in': (client) => {
+    const adminPage = client.page.admin();
+    const {testData: {admin}} = client.globals;
+
+    adminPage.navigateAndLogin(admin);
+  },
+  'navigate to the embed stream': (client) => {
+    const embedStream = client.page.embedStream();
+
+    embedStream
+      .navigate()
+      .ready();
+  },
+  'admin reports comment': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementVisible('@firstComment')
+      .waitForElementVisible('@flagButton')
+      .click('@flagButton');
+
+    comments.section.flag
+      .waitForElementVisible('@flagCommentRadio')
+      .click('@flagCommentRadio')
+      .waitForElementVisible('@continueButton')
+      .click('@continueButton')
+      .waitForElementVisible('@spamCommentRadio')
+      .click('@spamCommentRadio')
+      .click('@continueButton')
+      .waitForElementVisible('@popUpText')
+      .click('@continueButton');
+  },
+  'admin suspends user': (client) => {
+    const adminPage = client.page.admin();
+    const moderate = adminPage.section.moderate;
+    
+    adminPage
+      .navigate()
+      .ready()
+      .goToModerate();
+
+    moderate
+      .waitForElementVisible('@comment')
+      .waitForElementVisible('@commentActionMenu')
+      .waitForElementVisible('@actionMenuButton')
+      .click('@actionMenuButton')
+      .waitForElementVisible('@actionItemSuspendUser')
+      .click('@actionItemSuspendUser');
+
+    adminPage 
+      .waitForElementVisible('@suspendUserDialog')
+      .waitForElementVisible('@suspendUserConfirmButton')
+      .click('@suspendUserConfirmButton')
+      .waitForElementVisible('@supendUserSendButton')
+      .click('@supendUserSendButton');
+
+    adminPage
+      .waitForElementVisible('@toast')
+      .waitForElementVisible('@toastClose')
+      .click('@toastClose');
+
+  },
+  'admin logs out': (client) => {
+    const adminPage = client.page.admin();
+
+    adminPage
+      .logout();
+  },
+  'user logs in (2)': (client) => {
+    const {testData: {user}} = client.globals;
+    const embedStream = client.page.embedStream();
+    const comments = client.page.embedStream().section.comments;
+
+    embedStream
+      .navigate()
+      .ready();
+
+    comments
+      .openLoginPopup((popup) => popup.login(user));
+  },
+  'user account is suspended, should see restricted message box': (client) => {
+    const embedStream = client.page.embedStream();
+    const comments = embedStream.section.comments;
+
+    comments
+      .waitForElementVisible('@restrictedMessageBox');
+  },
+};