Added nested attributes for tests, etc.