Cleaned up initial reporting unit test