Merge pull request #55 from AwaNoodle/master

#52 - Refactor unit test layout and naming to be more BDD orientated
Merge pull request #56 from AwaNoodle/master

#52 - Refactor unit test layout and naming to be more BDD orientated