POD and small changes for testing