Fixes and another test