Add tests for a bunch of new features I would to see implemented