fixed test
fixed slug conflicts