added tests, renamed test, removed old files