ignore test files
Simplified code a lot.
Minor text adjustment.