Still tweaking tests