fixes #40 - Introduced unit testing