Delete old test function, fix reset bug