Deleted old test
refactored out database to use source id for uniqueness
Tidied syntax
Added more params