This is not ready to be merged

I added tests for features I need and made a change that makes one of the tests pass without breaking other tests.