Account page, test clean up, merging backend changes