Added initial implementation of unit tests