added some tests, renamed files