Improve some testing