Update for new markup

Add test fixture