Testing refactor

* Remove unecessary lines
Merge branch 'master' into chore/testing-refactor

Conflicts:
	coverage/.last_run.json
Add curly brackets for one line background
Merge pull request #27 from crowdint/chore/testing-refactor

Testing refactor