Added test.
Reverted small refactor.