Fix up messages page, add test for machines.