Small fixes on tests et al.