Add baseline sections model and clean up tests