cleanup and made slow tests explicit