[#18] Tests refactoring