Separated some unit tests into more well-defined units