more tests. some fixes.