Added initial Unit Tests