diff --git a/cmake/BuildSophia.cmake b/cmake/BuildSophia.cmake
index 634bd70e29e1eb65faeee1faa32ca9aed7d9e0ee..ef36158b9a3f7df297d58f4efe643ecfdd6848a8 100644
--- a/cmake/BuildSophia.cmake
+++ b/cmake/BuildSophia.cmake
@@ -6,7 +6,7 @@ macro(sophia_build)
     if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/third_party/sophia/db/libsophia.a
 			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/third_party/sophia
-			COMMAND $(MAKE) -C db
+			COMMAND $(MAKE) -C db libsophia.a
 			DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
 		)
     else()
@@ -16,7 +16,7 @@ macro(sophia_build)
 		add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/sophia/db/libsophia.a
 			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/sophia
             COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/third_party/sophia ${PROJECT_BINARY_DIR}/third_party/sophia
-			COMMAND $(MAKE) -C db
+			COMMAND $(MAKE) -C db libsophia.a
             DEPENDS ${PROJECT_BINARY_DIR}/CMakeCache.txt ${PROJECT_BINARY_DIR}/third_party/sophia
 		)
     endif()
diff --git a/src/box/recovery.cc b/src/box/recovery.cc
index be6802377a469307c7b5f1f4d03444e54374414d..9a17428d4328a0651a637a134130ad18e93bceda 100644
--- a/src/box/recovery.cc
+++ b/src/box/recovery.cc
@@ -410,37 +410,24 @@ recover_snap(struct recovery_state *r)
 	struct log_io *snap;
 	int64_t lsn;
 
-	if (log_dir_scan(&r->snap_dir) != 0) {
-		say_error("can't find snapshot");
-		goto error;
-	}
+	if (log_dir_scan(&r->snap_dir) != 0)
+		panic("can't scan snapshot directory");
 	lsn = log_dir_greatest(&r->snap_dir);
-	if (lsn <= 0) {
-		say_error("can't find snapshot");
-		goto error;
-	}
+	if (lsn <= 0)
+		panic("can't find snapshot! "
+		      "Didn't you forget to initialize storage?");
 	snap = log_io_open_for_read(&r->snap_dir, lsn, &r->node_uuid, NONE);
-	if (snap == NULL) {
-		say_error("can't find/open snapshot");
-		goto error;
-	}
+	if (snap == NULL)
+		panic("can't open snapshot");
 
-	if (tt_uuid_is_nil(&r->node_uuid)) {
-		say_error("can't find node uuid in snapshot");
-		goto error;
-	}
+	if (tt_uuid_is_nil(&r->node_uuid))
+		panic("can't find node uuid in snapshot");
 
 	say_info("recover from `%s'", snap->filename);
-	if (recover_wal(r, snap) == 0) {
-		recovery_end_recover_snapshot(r);
-		return;
-	}
-error:
-	if (log_dir_greatest(&r->snap_dir) <= 0) {
-		say_crit("didn't you forget to initialize storage with --init-storage switch?");
-		_exit(1);
-	}
-	panic("snapshot recovery failed");
+	if (recover_wal(r, snap) != 0)
+		panic("can't process snapshot");
+
+	recovery_end_recover_snapshot(r);
 }
 
 #define LOG_EOF 0
diff --git a/test/box/digest.result b/test/box/digest.result
index cf0ae3fe46209ab10217e07b09415070df02c181..c32ed688d370169e96b7e3d5aac9c6c12ebbae57 100644
--- a/test/box/digest.result
+++ b/test/box/digest.result
@@ -1,148 +1,148 @@
-lua type(box.digest)
+type(box.digest)
 ---
- - table
+- table
 ...
-lua box.digest.md4_hex()
+box.digest.md4_hex()
 ---
- - 31d6cfe0d16ae931b73c59d7e0c089c0
+- 31d6cfe0d16ae931b73c59d7e0c089c0
 ...
-lua box.digest.md5_hex()
+box.digest.md5_hex()
 ---
- - d41d8cd98f00b204e9800998ecf8427e
+- d41d8cd98f00b204e9800998ecf8427e
 ...
-lua box.digest.sha_hex()
+box.digest.sha_hex()
 ---
- - f96cea198ad1dd5617ac084a3d92c6107708c0ef
+- f96cea198ad1dd5617ac084a3d92c6107708c0ef
 ...
-lua box.digest.sha1_hex()
+box.digest.sha1_hex()
 ---
- - da39a3ee5e6b4b0d3255bfef95601890afd80709
+- da39a3ee5e6b4b0d3255bfef95601890afd80709
 ...
-lua box.digest.sha224_hex()
+box.digest.sha224_hex()
 ---
- - d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f
+- d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f
 ...
-lua box.digest.sha256_hex()
+box.digest.sha256_hex()
 ---
- - e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+- e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 ...
-lua box.digest.sha384_hex()
+box.digest.sha384_hex()
 ---
- - 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b
+- 38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b
 ...
-lua box.digest.sha512_hex()
+box.digest.sha512_hex()
 ---
- - cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+- cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
 ...
-lua string.len(box.digest.md4_hex())
+string.len(box.digest.md4_hex())
 ---
- - 32
+- 32
 ...
-lua string.len(box.digest.md5_hex())
+string.len(box.digest.md5_hex())
 ---
- - 32
+- 32
 ...
-lua string.len(box.digest.sha_hex())
+string.len(box.digest.sha_hex())
 ---
- - 40
+- 40
 ...
-lua string.len(box.digest.sha1_hex())
+string.len(box.digest.sha1_hex())
 ---
- - 40
+- 40
 ...
-lua string.len(box.digest.sha224_hex())
+string.len(box.digest.sha224_hex())
 ---
- - 56
+- 56
 ...
-lua string.len(box.digest.sha256_hex())
+string.len(box.digest.sha256_hex())
 ---
- - 64
+- 64
 ...
-lua string.len(box.digest.sha384_hex())
+string.len(box.digest.sha384_hex())
 ---
- - 96
+- 96
 ...
-lua string.len(box.digest.sha512_hex())
+string.len(box.digest.sha512_hex())
 ---
- - 128
+- 128
 ...
-lua string.len(box.digest.md4())
+string.len(box.digest.md4())
 ---
- - 16
+- 16
 ...
-lua string.len(box.digest.md5())
+string.len(box.digest.md5())
 ---
- - 16
+- 16
 ...
-lua string.len(box.digest.sha())
+string.len(box.digest.sha())
 ---
- - 20
+- 20
 ...
-lua string.len(box.digest.sha1())
+string.len(box.digest.sha1())
 ---
- - 20
+- 20
 ...
-lua string.len(box.digest.sha224())
+string.len(box.digest.sha224())
 ---
- - 28
+- 28
 ...
-lua string.len(box.digest.sha256())
+string.len(box.digest.sha256())
 ---
- - 32
+- 32
 ...
-lua string.len(box.digest.sha384())
+string.len(box.digest.sha384())
 ---
- - 48
+- 48
 ...
-lua string.len(box.digest.sha512())
+string.len(box.digest.sha512())
 ---
- - 64
+- 64
 ...
-lua box.digest.md5_hex(123)
+box.digest.md5_hex(123)
 ---
- - 202cb962ac59075b964b07152d234b70
+- 202cb962ac59075b964b07152d234b70
 ...
-lua box.digest.md5_hex('123')
+box.digest.md5_hex('123')
 ---
- - 202cb962ac59075b964b07152d234b70
+- 202cb962ac59075b964b07152d234b70
 ...
-lua box.digest.md5_hex(true)
+box.digest.md5_hex(true)
 ---
- - b326b5062b2f0e69046810717534cb09
+- b326b5062b2f0e69046810717534cb09
 ...
-lua box.digest.md5_hex('true')
+box.digest.md5_hex('true')
 ---
- - b326b5062b2f0e69046810717534cb09
+- b326b5062b2f0e69046810717534cb09
 ...
-lua box.digest.md5_hex(nil)
+box.digest.md5_hex(nil)
 ---
- - d41d8cd98f00b204e9800998ecf8427e
+- d41d8cd98f00b204e9800998ecf8427e
 ...
-lua box.digest.md5_hex()
+box.digest.md5_hex()
 ---
- - d41d8cd98f00b204e9800998ecf8427e
+- d41d8cd98f00b204e9800998ecf8427e
 ...
-lua box.digest.crc32()
+box.digest.crc32()
 ---
- - 4294967295
+- 4294967295
 ...
-lua box.digest.crc32_update(4294967295, '')
+box.digest.crc32_update(4294967295, '')
 ---
- - 4294967295
+- 4294967295
 ...
-lua box.digest.crc32('abc')
+box.digest.crc32('abc')
 ---
- - 3384066120
+- 3384066120
 ...
-lua box.digest.crc32_update(4294967295, 'abc')
+box.digest.crc32_update(4294967295, 'abc')
 ---
- - 3384066120
+- 3384066120
 ...
-lua box.digest.crc32('abccde')
+box.digest.crc32('abccde')
 ---
- - 3628146660
+- 3628146660
 ...
-lua box.digest.crc32_update(box.digest.crc32('abc'), 'cde')
+box.digest.crc32_update(box.digest.crc32('abc'), 'cde')
 ---
- - 3628146660
+- 3628146660
 ...
diff --git a/test/box/digest.test b/test/box/digest.test
deleted file mode 100644
index b121b8d048307c965815cefc21aebb4fada5b293..0000000000000000000000000000000000000000
--- a/test/box/digest.test
+++ /dev/null
@@ -1,46 +0,0 @@
-# encoding: tarantool
-
-exec admin "lua type(box.digest)"
-
-exec admin "lua box.digest.md4_hex()"
-exec admin "lua box.digest.md5_hex()"
-exec admin "lua box.digest.sha_hex()"
-exec admin "lua box.digest.sha1_hex()"
-exec admin "lua box.digest.sha224_hex()"
-exec admin "lua box.digest.sha256_hex()"
-exec admin "lua box.digest.sha384_hex()"
-exec admin "lua box.digest.sha512_hex()"
-
-exec admin "lua string.len(box.digest.md4_hex())"
-exec admin "lua string.len(box.digest.md5_hex())"
-exec admin "lua string.len(box.digest.sha_hex())"
-exec admin "lua string.len(box.digest.sha1_hex())"
-exec admin "lua string.len(box.digest.sha224_hex())"
-exec admin "lua string.len(box.digest.sha256_hex())"
-exec admin "lua string.len(box.digest.sha384_hex())"
-exec admin "lua string.len(box.digest.sha512_hex())"
-
-exec admin "lua string.len(box.digest.md4())"
-exec admin "lua string.len(box.digest.md5())"
-exec admin "lua string.len(box.digest.sha())"
-exec admin "lua string.len(box.digest.sha1())"
-exec admin "lua string.len(box.digest.sha224())"
-exec admin "lua string.len(box.digest.sha256())"
-exec admin "lua string.len(box.digest.sha384())"
-exec admin "lua string.len(box.digest.sha512())"
-
-exec admin "lua box.digest.md5_hex(123)"
-exec admin "lua box.digest.md5_hex('123')"
-exec admin "lua box.digest.md5_hex(true)"
-exec admin "lua box.digest.md5_hex('true')"
-exec admin "lua box.digest.md5_hex(nil)"
-exec admin "lua box.digest.md5_hex()"
-
-exec admin "lua box.digest.crc32()"
-exec admin "lua box.digest.crc32_update(4294967295, '')"
-
-exec admin "lua box.digest.crc32('abc')"
-exec admin "lua box.digest.crc32_update(4294967295, 'abc')"
-
-exec admin "lua box.digest.crc32('abccde')"
-exec admin "lua box.digest.crc32_update(box.digest.crc32('abc'), 'cde')"
diff --git a/test/box/digest.test.lua b/test/box/digest.test.lua
new file mode 100644
index 0000000000000000000000000000000000000000..53a69da725170b9d4078688603c7827b707a6400
--- /dev/null
+++ b/test/box/digest.test.lua
@@ -0,0 +1,44 @@
+type(box.digest)
+
+box.digest.md4_hex()
+box.digest.md5_hex()
+box.digest.sha_hex()
+box.digest.sha1_hex()
+box.digest.sha224_hex()
+box.digest.sha256_hex()
+box.digest.sha384_hex()
+box.digest.sha512_hex()
+
+string.len(box.digest.md4_hex())
+string.len(box.digest.md5_hex())
+string.len(box.digest.sha_hex())
+string.len(box.digest.sha1_hex())
+string.len(box.digest.sha224_hex())
+string.len(box.digest.sha256_hex())
+string.len(box.digest.sha384_hex())
+string.len(box.digest.sha512_hex())
+
+string.len(box.digest.md4())
+string.len(box.digest.md5())
+string.len(box.digest.sha())
+string.len(box.digest.sha1())
+string.len(box.digest.sha224())
+string.len(box.digest.sha256())
+string.len(box.digest.sha384())
+string.len(box.digest.sha512())
+
+box.digest.md5_hex(123)
+box.digest.md5_hex('123')
+box.digest.md5_hex(true)
+box.digest.md5_hex('true')
+box.digest.md5_hex(nil)
+box.digest.md5_hex()
+
+box.digest.crc32()
+box.digest.crc32_update(4294967295, '')
+
+box.digest.crc32('abc')
+box.digest.crc32_update(4294967295, 'abc')
+
+box.digest.crc32('abccde')
+box.digest.crc32_update(box.digest.crc32('abc'), 'cde')