Added a few more missing tests