Fix Tests and prepare for rake release