added tests, renamed files
removed files