Adding some missed tests