Updated some missing tests