0.01 - fixing POD and tests