Update Index bug fixes + added functional tests