tasks tests improved
fix a few more tests/cleanup