More refactoring of tests per feature

Change-Id: Ie9acf09f9bb992f6e03ff6dfbb80e1e20a9d43ca
Merge "More refactoring of tests per feature"