Cleaned up MenuTest