some more tests added, some writing