Add test to cover all