Improved module import for testing