Testing additonal output + test code refactor