Improve some very basic tests