Added improvements to test code

For each group of test has been created separate folder

Change-Id: I05d59b50386d270a1c70428db67ff5357ddbf21f