Added corresponding Unit Test