Started work on Data Options unit tests