#287, #288, #289 Continue with test verification and some structure refactoring