Added some Tests && fixed WTF in OgDrupalToolkit