Add basic Cloudwatch support. Improve all metric and service tests