Updated with LyX testcases