Minor changes to test to have consistent name. Make label ordering in GUI match algorithm.