Update tests and common module