See if this satisfies the test matrix - removing warnings for statement