All tests passing (except the ones I commented out, but see the comments in the code regarding that)