[added]Added additional tests and renamed some files