Updated some tests

Updated some tests