Edited test control stuff