Rewrite unit tests to be much more organized