Finished up some tests and made them pass