Change order of scripts and re-enable tests