remove old test, simplify things