Removed Console.Write and Test-changes