MOB-213 tests and function close move fix