Add adastley's unit tests
Add adastley's acceptance tests