slightly updated testing