Fixed tests WIP.