moved

Change-Id: I26d4494426a66ab822c6cde539f248e199a5aa7f
test coverage improved

Change-Id: I23441c8e90935d470621613e12ce73858785340f