Applied semantic modifications pattern and fixed tests