I'll add a few more tests and adjust.