Cleaned up test app