Added more test control stuff