Added requested unit tests