improve tests and add partials