Extracted test to separate class

Change-Id: Ibfad0180e93e7f74b91427761b40c86938044c50
Remove possibility to use static inner classes for tests

Change-Id: I461568918bc09bd7a09abbf9c4a34f1a5f3b997f