Fixed google plus
Added tests