   generateRandomString
   checkBongoConnectivity } = require '../../../testhelper'
 
-JUser    = require './user'
-JGroup   = require './group'
-JAccount = require './account'
-JSession = require './session'
+JUser            = require './user'
+JGroup           = require './group'
+JAccount         = require './account'
+JAppStorage      = require './appstorage'
+{ Relationship } = require 'jraphical'
 
 
 # making sure we have db connection before tests

          account.fetchOrCreateAppStorage options, (err, appStorage) ->
            expect(err).to.not.exist
            expect(appStorage).to.be.an 'object'
            expect(appStorage.accountId).to.be.deep.equal account._id
            expect(appStorage.storage[appId]).to.be.an 'object'
            expect(appStorage.storage[appId]['version']).to.be.a 'string'
            expect(appStorage.storage[appId]['data']).to.be.an 'object'
            expect(appStorage.storage[appId]['data']).to.be.empty
            done()

              # expecting previously created app storage to be fetched
              account.fetchOrCreateAppStorage options, (err, storage) ->
                expect(err).to.not.exist
                expect(storage.bongo_.constructorName).to.be.equal 'JCombinedAppStorage'
                expect(storage._id.toString()).to.be.equal appStorage._id.toString()
                expect(storage.accountId).to.be.deep.equal appStorage.accountId
                expect(storage.storage[appId]).to.be.deep.equal appStorage.storage[appId]
