Fix short code unit tests