cleanup and enable tests