Update Test and Documentation