Renamed expressions and cleaned up tests