Finished testing for last two functions