Made imports explicit and refactored base test class