Fix #435 - Tests take too long