Added google test
Added some loose ends....