fixed nonpassing tests