comment out pending tests
simplify