Added a new test and working on factoring out jake to make it simpler.