Return source ids as BIGINTs, which should map to Long.  Also fix Mock
tests.