Fixes, tests