add wrapping sanitizer and cleanup tests