added nested attributes for tests, etc.
Merge pull request #5 from Kris-Simpson/tests

Added nested attributes for tests, etc.