Fixed missed tests