Update tests and docs