diff --git a/src/busy.rs b/src/busy.rs
index b9a5d40..18fa7e2 100644
--- a/src/busy.rs
+++ b/src/busy.rs
@@ -1,4 +1,4 @@
-///! Busy handler (when the database is locked)
+//! Busy handler (when the database is locked)
 use std::convert::TryInto;
 use std::mem;
 use std::os::raw::{c_int, c_void};
diff --git a/src/lib.rs b/src/lib.rs
index 1b3b17e..49ab436 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2120,7 +2120,11 @@ mod test {
         let name = "Lisa";
         let age = 8;
         let mut stmt = prepare_and_bind!(db, "SELECT $name, $age;");
-        let (v1, v2) = stmt.raw_query().get_expected_row().and_then(|r| Ok((r.get::<_,String>(0)?, r.get::<_,i64>(1)?)))?;
+        let (v1, v2) = stmt
+            .raw_query()
+            .next()
+            .and_then(|o| o.ok_or(Error::QueryReturnedNoRows))
+            .and_then(|r| Ok((r.get::<_, String>(0)?, r.get::<_, i64>(1)?)))?;
         assert_eq!((v1.as_str(), v2), (name, age));
         Ok(())
     }
diff --git a/src/vtab/vtablog.rs b/src/vtab/vtablog.rs
index 1b3e1b8..f7aa1b1 100644
--- a/src/vtab/vtablog.rs
+++ b/src/vtab/vtablog.rs
@@ -1,4 +1,4 @@
-///! Port of C [vtablog](http://www.sqlite.org/cgi/src/finfo?name=ext/misc/vtablog.c)
+//! Port of C [vtablog](http://www.sqlite.org/cgi/src/finfo?name=ext/misc/vtablog.c)
 use std::default::Default;
 use std::marker::PhantomData;
 use std::os::raw::c_int;