menutest update
merged
core finished