Updates fixtures so that tests will pass with with lazy loading
Merge branch 'offline'