improve tests based on qperez