Adding tests and style tweaks:
Final Push of internship to GH. Improve lots of test coverage
Final commit :( Add trigger tests