WIP Refactoring all tests

Change-Id: Ie07fc848faa72030659887e6ed29365200df33df