Revert "sigh"

This reverts commit fbef9d96055da9ec6f09bbb15e79b243f5ede1c7.
commented tests and got rid of warnings