Added further user functionality and additional tests