Minor improvements in test fixtures

- Changed the structure of test fixtures data
- Changed some terms used
- Other minor changes

Change-Id: I803ff7868056ae286b4004ea95c13a0f786d462e