Split and add tests