Trying to improve the current test cases. Accidentally caused some issues from rerunning the code multiple times as well