Improved tests for sources