Correct values handling, added tests