start of improved tests