Added more settings, numberTests and testDelay
updated TODO list to reflect previous commit
edited comments