Cleaned up test-wrap.R