Minor Fixes & Tests