Improve tests a bit