Added fixed BC CipherInputStream; still two tests failing