Cleaned up tests a little bit.
Added comments