Fixes & more tests