Added some tests, renamed files