Fixed some errors in unit tests. All tests now running locally.