[no bug] Cleaned up remaining output of unit tests.

@lonnen, this is all about removing code, I'm sure you will enjoy reviewing it! :)