fixes, tests updates