Fixed specs for new markup