Simplify test generation
Add some more benchmark tests