Version 0.0.0.10 tests refactor