- improved tests