Added initial unittests