Remove generated source
Simplify test code