Addresses #2 - adds a test structure, but no real tests