Resolved tests errors and warnings

Change-Id: I076af7ae204305917d66e554ebdfecfd768273c0