Minor changes to tests for POC