Improve some test helpers