Some additional steps. Split up tests because we're starting to have more than just a few.