Update tests for new markup