Finish porting tests from section ch12