Uncommenting tests, hope they run