Fixed test & spec fail