Adding few tests