Refactoring
Use warning level 2
Revert "Add TEST_HARD mode"

This reverts commit ee37c1d8eade15325882e82c9bf0442337bf0d9c.
Refactoring