+ Remove unnecessary header files
+ Add a robustness pseudo-test