Adjust some Test's, fix ViewCommands.cs (hint from linquize)