Adding back missing tests