Removed Haxfred from helpers call
Added new helper function
Rewrote tests