Took commented out tests back into use.