Unit and Acceptance Tests

For John Dees (jcd90) and Tracy Mullen (tkm368)