Fix tests

Conflicts:
	public/js/lib/utils.js