modified two tests