Fixed tests to work with layer supertype