Fixing failing test.

Need to revisit and refactor.