Update tests and project