Converted tests from package to module.