Code cleanup
Some expression tests added