more tests

more tests and lead to slightly more bug fixes.