Another one
added tests