Add test and consistent markup for #4.