Last few unit tests readded.