Rewrite tests for better looks and coolness