Test improvements/tweaks