Adding more tests for more edge cases
Added test but need to build another one-off module for that