Better testing of edge cases