ts25442 - Acceptance and Unit Tests

Acceptance and Unit Tests for Tim Simmons
1/29