updating test
renaming and removing untested files