Implement some of the missing tests