Whoops.. add tests back