Fixes
Added missing tests