Adds tests that I'd like to see pass