Some more fixes to get tests running, removed 1.8 hash syntax