To match with the raw inspector. Adds tests to verify its functionality. Signed-off-by: David Calavera <david.calavera@gmail.com>