Test claim status updates

More commits coming soon!