Updates to test to support new Menu adding and Menu item adding
Remove old robotium test