Adding some more tests for different cases to make sure they keep working Co-authored-by: techknowlogick <[email protected]>