Fixes + Tests