Fix test
Fix main class package