Fixed unit tests

The unit tests were failing this tests fixes them.