Tests + Fixes