Improved unit tests (patched loopingcall)and one removed VIM comment in code

Change-Id: Ifdec9ba67668f237e8953ed6d7552ab7bacb1b34