Improve tests & partials