Added tests, these will be removed once ready for CD. Issue #2