Cleaned up all the loggin in tests