added partials & updated tests