Fixed few tests