improvements to tests