Some fixes in function names and more tests was added.