Adding tests back to the mix.
Adding tests back to the mix.