Fixed tests. Will add more.