Changes to rectify errors thrown by the Unit Tests

Made some changes as per the output of Unit tests using PHPUnit