Fixing tests to use Longs