[1,2](Dan, Nicolette) Added functional tests for user tests 1 and 2