Fix Specs for Better Coverage