Moves to wrapping in collection methods. Updates tests + builds.