refactoring to adhere to Eclipse Unit tests standards
fixed build problem for unit tests