Reduce time to 250ms, fix tests