Small include/unit test fix around norm*