Changes to make unit tests work in Eclipse