and remove tests (bug 858398)