improve tests a bit