— Updated some tests