attempt to improve tests