Fixed unit tests and reduced test data amount
removed deprecated llocations