tests etc revised