Fixed NotImplementedException and added the PHPUnit Tests