Added sqlcipher handling, refactored DaoTest to work