#38 Convert QS tests