Simplify things in test