add tests and update with tailor fixes