Cleaned up setUp and tearDown function. Also updated it to display the