minor bug fixes, removed folder tests
