Improve some lacking tests.