Updated some unit tests
cosme