Refactored Layout tests. Remove errors (#13823)

Split tests into separate classes. Create hierarcy for tests.

Change-Id: I71e20a5410612f9a246bab051173e60768532185