Re-ordered getElements list, added unit test assertion to validate number of value options