fixed tests, fixed incorrect User output