changed test results
explicit sypport for <g>, improve <expan>