added folder move test
remove unused code
improved tests