In progress fixes for quicktests