Tweaking to get tests running.