Minor changes and review fixes to tests