changed output and tests