slug fix and tests