Got tests running again