Update test, fixed some inconsistencies