updated to get tests running again