Issue 86: More comprehensive Layout test coverage. Shortening class and template names.