[TEST] - fix ignored tests, checkstyle, refactoring

@rmansoor have a look, please.