Fixes some unit tests