Added new unit test
Fixed the circular loading issue
Fixed unit testing