improved tests further