diff --git a/.gitignore b/.gitignore
index 5fd2a7d..a0b2628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ layers
 interfaces
 .testrepository
 *__pycache__*
+*.pyc
diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..cbd2f20
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/charm-aodh.git
diff --git a/src/README.md b/src/README.md
index 0e4d67e..a017c93 100644
--- a/src/README.md
+++ b/src/README.md
@@ -18,4 +18,4 @@ Aodh relies on services from the mongodb, rabbitmq-server and keystone charms:
 
 Please report bugs on [Launchpad](https://bugs.launchpad.net/charms/+source/aodh/+filebug).
 
-For general questions please refer to the OpenStack [Charm Guide](https://github.com/openstack/charm-guide).
+For general questions please refer to the OpenStack [Charm Guide](http://docs.openstack.org/developer/charm-guide/).
diff --git a/src/lib/charm/__init__.py b/src/lib/charm/__init__.py
new file mode 100644
index 0000000..9b088de
--- /dev/null
+++ b/src/lib/charm/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/src/lib/charm/openstack/__init__.py b/src/lib/charm/openstack/__init__.py
new file mode 100644
index 0000000..9b088de
--- /dev/null
+++ b/src/lib/charm/openstack/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/src/metadata.yaml b/src/metadata.yaml
index bd65773..eb5ed53 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -9,9 +9,6 @@ description: |
  overall system.
  .
  Aodh provides the Alarming service as part of OpenStack telemetry.
-series:
-  - xenial
-  - trusty
 requires:
   mongodb:
     interface: mongodb
diff --git a/src/reactive/__init__.py b/src/reactive/__init__.py
new file mode 100644
index 0000000..9b088de
--- /dev/null
+++ b/src/reactive/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2016 Canonical Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index e76e047..613b081 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -19,3 +19,5 @@ python-swiftclient>=2.6.0,<3.0
 pika>=0.10.0,<1.0
 distro-info
 # END: Amulet OpenStack Charm Helper Requirements
+# NOTE: workaround for 14.04 pip/tox
+pytz
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index d8f1fe8..1017763 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -20,7 +20,9 @@ sys.path.append('src/lib')
 
 # Mock out charmhelpers so that we can test without it.
 # also stops sideeffects from occuring.
+apt_pkg = mock.MagicMock()
 charmhelpers = mock.MagicMock()
+sys.modules['apt_pkg'] = apt_pkg
 sys.modules['charmhelpers'] = charmhelpers
 sys.modules['charmhelpers.core'] = charmhelpers.core
 sys.modules['charmhelpers.core.hookenv'] = charmhelpers.core.hookenv