Switch to biggus for deferred loading.
Update tests.