Changing output and adding test