Merge "Add verification to tests, fix warning."