Cleaned up test setup to prepare for thorough testing