remove unused test code
Simplify test13