Updating tests
Fix markup to confirm to that expected by front end.