Update tests and code
fix feedback