fix unit tests;
use @Before and @After annotations;
make sure Debug flags are reset
Merge remote-tracking branch 'origin/4.5.4' into 4.5.4