improve some thor tests