improve tests a little