Implement missing tests