refactored source tests