diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a7d62a..51fa48f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## v6.0
+ - Don't require jquery #119
+ - Document `importCss` #124
+ - Document angle bracket invocations #128
+ - Transfer addon to `adopted-ember-addons` #130
+ - Fix notifications in IE #125
+ - Use SVG for the badge #118
+ - Update modules to new style of import #131
+ - Update README with new `inject` import #126
+ - Cleanup code #132
+ - Add support for unique identifier #132
+ - Update `ember` blueprints to `3.10` #133
+ - Drop support for `ember` < `3.4` #133
+ - Lint templates, fix deprecations #133
+ - Cleanup code and update documentation #134
+ - Refactor to avoid using `observer` #135
+ - Remove `Notify.testing` and custom `Runner` #135
+ - Update changelog, release `6.0.0` #136
+
 ## v5.0
 
 - The default theme is now compatible with Foundation 6. If you want to use Foundation 5 then use `{{ember-notify messageStyle='foundation-5'}}`
diff --git a/README.md b/README.md
index e225a86..4f94519 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ Using angle bracket invocation, available in Ember 3.4+
 Or you can control when each message is closed:
 
 ```js
-let message = this.notify.alert('You can control how long it\'s displayed', {
+let message = this.notify.alert(`You can control how long it's displayed`, {
   closeAfter: 10000 // or set to null to disable auto-hiding
 });
 ```
@@ -75,7 +75,7 @@ this.notify.info({ html: '<div class="my-div">Hooray!</div>' });
 Rounded corners, if that's your thing:
 
 ```js
-this.notify.alert('This one\'s got rounded corners.', {
+this.notify.alert(`This one's got rounded corners.`, {
   radius: true
 });
 ```
@@ -103,7 +103,7 @@ The others you will need to provide a `source` property, so secondary containers
 {{ember-notify source=someProperty}}
 ```
 
-Using angle bracket invocation
+Using angle bracket invocation:
 
 ```hbs
 <EmberNotify @source={{someProperty}} />
@@ -137,14 +137,14 @@ You can pass a block with template you want to use for each message (instead of
   {{/ember-notify}}
 ```
 
-Using angle bracket invocation
+Using angle bracket invocation:
 
 ```hbs
   <EmberNotify as |message close|>
-    <a {{action close}} class='close'>
+    <a {{action close}} class="close">
       close from block
     </a>
-    <span class='message-from-block'>
+    <span class="message-from-block">
       {{message.text}}
     </span>
   </EmberNotify>
@@ -159,16 +159,16 @@ you are using *Closure Actions* syntax passing the action (e. g. `<a {{action cl
 By default, the `ember-notify` message will appear in the bottom right corner of the screen. You may want to control the positioning or the animation. To do so, you need to pass a CSS class using the `defaultClass` option. This will render the top level `ember-notify` element with the class you pass in.
 
 ```hbs
-<!-- gives class="ember-notify-cn custom-notify"> to top level element-->
+<!-- Gives class="custom-notify"> to top level element -->
 {{ember-notify defaultClass="custom-notify"}}
 
 ```
 
-Using angle bracket invocation
+Using angle bracket invocation:
 
 ```hbs
-<!-- gives class="ember-view ember-notify-cn custom-notify"> to top level element-->
-<EmberNotify @classPrefix={{"custom-notify"}} />
+<!-- Gives class="custom-notify"> to top level element -->
+<EmberNotify @defaultClass="custom-notify" />
 
 ```
 
diff --git a/addon/index.js b/addon/index.js
index 701d2fe..ecc5a4c 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -55,9 +55,6 @@ let Notify = Service.extend({
       this.pending = [];
     }
   }
-}).reopenClass({
-  // set to true to disable testing optimizations that are enabled when Ember.testing is true
-  testing: false
 });
 
 export default Notify.reopenClass({
diff --git a/package.json b/package.json
index 4ea8368..34d47e4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-notify",
-  "version": "5.2.1",
+  "version": "6.0.0",
   "description": "Easy, wee little notifications",
   "keywords": [
     "ember-addon"