more unit_tests, less working code....