Remove useless test modules
Improve style and conciseness (part 16)