Acceptance and Unit Tests for oaf226