Changing test output, possible redesign in works.