Refactoring tests; fix some imports (need fully qualfied package name to work on Jenkins)