Shift some element options to abstract and remove test element array code