Fixed shade SP + tests