Combination tests + small changes
Merge branch 'SCARY-SHIT' of https://github.com/ilikeapples312/cse136 into SCARY-SHIT