Added ability to take all types of tests