- update before/after to start/end in unit test app Change-Id: Id7286ef5d9390540faf8ecd5f0b1c140d04bb364