moved/renamed files. added more tests.