Add long form function and update element creation
Start to add tests