Added Console skins tests + some refactorings in other tests