Made some more modifications to tests