Add adastley's Unit tests