Add a few more tests to cover ann the combinations