diff --git a/bin/cylc-review b/bin/cylc-review
index b1843d5942a..f105f0e6a2d 100755
--- a/bin/cylc-review
+++ b/bin/cylc-review
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/cylc/cylc-review/static/js/cylc-review.js b/lib/cylc/cylc-review/static/js/cylc-review.js
index 360f80ddf02..388dae62f94 100644
--- a/lib/cylc/cylc-review/static/js/cylc-review.js
+++ b/lib/cylc/cylc-review/static/js/cylc-review.js
@@ -1,6 +1,6 @@
 /******************************************************************************
  * THIS FILE IS PART OF THE CYLC SUITE ENGINE.
- * Copyright (C) 2008-2018 NIWA
+ * Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/cylc/cylc-review/static/js/search.js b/lib/cylc/cylc-review/static/js/search.js
index 0b373e5c3cd..dc3d99f197d 100644
--- a/lib/cylc/cylc-review/static/js/search.js
+++ b/lib/cylc/cylc-review/static/js/search.js
@@ -1,6 +1,6 @@
 /******************************************************************************
  * THIS FILE IS PART OF THE CYLC SUITE ENGINE.
- * Copyright (C) 2008-2018 NIWA
+ * Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib/cylc/review.py b/lib/cylc/review.py
index c7ba1b90487..329c6652dad 100644
--- a/lib/cylc/review.py
+++ b/lib/cylc/review.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/cylc/ws.py b/lib/cylc/ws.py
index f6e78090f52..5525693f971 100644
--- a/lib/cylc/ws.py
+++ b/lib/cylc/ws.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -91,8 +91,9 @@ def ws_cli(service_cls, service_docstr, *args, **kwargs):
     else:
         for key, value in sorted(status.items()):
             print "%s=%s" % (key, value)
-        if (arg == "stop" and status.get("pid") and (opts.non_interactive or
-            raw_input("Stop server via termination? y/n (default=n)") == "y")):
+        if (arg == "stop" and status.get("pid") and
+                (opts.non_interactive or raw_input(
+                 "Stop server via termination? y/n (default=n)") == "y")):
             try:
                 os.killpg(int(status["pid"]), signal.SIGTERM)
             except OSError:
diff --git a/tests/cylc-review/00-basic.t b/tests/cylc-review/00-basic.t
index d4cc03f9d87..a819c41fe34 100755
--- a/tests/cylc-review/00-basic.t
+++ b/tests/cylc-review/00-basic.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/01-title.t b/tests/cylc-review/01-title.t
index 88513bb4cce..163e9007ca4 100755
--- a/tests/cylc-review/01-title.t
+++ b/tests/cylc-review/01-title.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/02-no-job-out.t b/tests/cylc-review/02-no-job-out.t
index 763c477e7b4..4584b7cd0a7 100755
--- a/tests/cylc-review/02-no-job-out.t
+++ b/tests/cylc-review/02-no-job-out.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/03-no-statuses.t b/tests/cylc-review/03-no-statuses.t
index 13f4df36ec9..2e986d5be71 100755
--- a/tests/cylc-review/03-no-statuses.t
+++ b/tests/cylc-review/03-no-statuses.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/04-time-sort.t b/tests/cylc-review/04-time-sort.t
index 59e201a0459..27a8988a2fe 100755
--- a/tests/cylc-review/04-time-sort.t
+++ b/tests/cylc-review/04-time-sort.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/05-cycles-job-fails.t b/tests/cylc-review/05-cycles-job-fails.t
index 26fb78b3d14..3fcc58ab2ae 100755
--- a/tests/cylc-review/05-cycles-job-fails.t
+++ b/tests/cylc-review/05-cycles-job-fails.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/06-host-port.t b/tests/cylc-review/06-host-port.t
index 9d00ac239d8..d3bfdf0e5cc 100755
--- a/tests/cylc-review/06-host-port.t
+++ b/tests/cylc-review/06-host-port.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/07-cycles-page.t b/tests/cylc-review/07-cycles-page.t
index e0a60fb3aa5..b3c6ef25931 100755
--- a/tests/cylc-review/07-cycles-page.t
+++ b/tests/cylc-review/07-cycles-page.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/08-suites-page.t b/tests/cylc-review/08-suites-page.t
index 1416e35d83f..96c1de9c006 100755
--- a/tests/cylc-review/08-suites-page.t
+++ b/tests/cylc-review/08-suites-page.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/09-jobs-fuzzy-time.t b/tests/cylc-review/09-jobs-fuzzy-time.t
index ed293a3c9dd..59be41b58a8 100755
--- a/tests/cylc-review/09-jobs-fuzzy-time.t
+++ b/tests/cylc-review/09-jobs-fuzzy-time.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/10-jobs-task-status.t b/tests/cylc-review/10-jobs-task-status.t
index 11b666fcbd8..45c09f083a9 100755
--- a/tests/cylc-review/10-jobs-task-status.t
+++ b/tests/cylc-review/10-jobs-task-status.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/11-view-unicode.t b/tests/cylc-review/11-view-unicode.t
index d3f309b0f3a..18b73c77f61 100755
--- a/tests/cylc-review/11-view-unicode.t
+++ b/tests/cylc-review/11-view-unicode.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/12-cycle-counts.t b/tests/cylc-review/12-cycle-counts.t
index 3da6c9950fe..5752f1dbd9b 100755
--- a/tests/cylc-review/12-cycle-counts.t
+++ b/tests/cylc-review/12-cycle-counts.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/13-jobs-path-in-tar.t b/tests/cylc-review/13-jobs-path-in-tar.t
index 213e6699fda..bb30f229b48 100755
--- a/tests/cylc-review/13-jobs-path-in-tar.t
+++ b/tests/cylc-review/13-jobs-path-in-tar.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/cylc-review/14-doctest.t b/tests/cylc-review/14-doctest.t
index bd7f1d96de1..87046409c3c 100644
--- a/tests/cylc-review/14-doctest.t
+++ b/tests/cylc-review/14-doctest.t
@@ -1,6 +1,6 @@
 #!/bin/bash
 # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
-# Copyright (C) 2008-2018 NIWA
+# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by