- Fixed args, added some tests and changed folder name for then