Validation, fixture and unit tests added.