Fixes and new test