Added back missing tests