Additional numeric tests (expand, conjugate) + minor reformatting