Fixed test packages and dependencies