Custom timeout + fixes tests