Attempt at splitting tests