Small tweaks to get tests compiling and running