Re-organizing source test