Some more tests, still working on it...