Added initial unit test version