Updated tests. No menu tests yet.