Fixing missing tests