Tests according refactored source