refactoring, p5-core-2.0b9 tests