Added unit tests. Fixed some bugs. Organised classes.

[rbh92]

PR contains a minor refactor, extracting logic into helper and service classes while maintaining the original structure for ease of comprehension. Methods have been given a number of optional parameters for method delegates to enable testing. Added unit tests for all logic. Fixes #40 Fixes #41