Allow to exec tests independently, and improved tests

Change-Id: Ice5630cfee1407553647029516ff13598f18a510