Added asserts in methods otherwise not performing any tests

Change-Id: I4db45a96e828327002a1590b476fb93c78416e7b
Merge "Added asserts in methods otherwise not performing any tests"