Updated unit tests to make travis happy