Added unit tests for TDD