updated tests and renamed some files