Implement again some missing tests