Updated comments and removed more warnings
Updated Unit test