Updated tests

Updated tests - 6 total