Fixed a couple of unit tests to make travis happy